From 77a341037e23c562203ec42440ae8443df7af527 Mon Sep 17 00:00:00 2001
From: root <root@lbt-desktop.(none)>
Date: Sat, 21 Aug 2010 10:56:13 +0800
Subject: [PATCH] modify rk2818_raho_defconfig to use bcm4329 wifi defaultly

---
 arch/arm/configs/rk2818_raho_defconfig | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/arch/arm/configs/rk2818_raho_defconfig b/arch/arm/configs/rk2818_raho_defconfig
index 7f701913535d..8ac72ba21605 100755
--- a/arch/arm/configs/rk2818_raho_defconfig
+++ b/arch/arm/configs/rk2818_raho_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.32.9
-# Thu Jul 29 09:04:46 2010
+# Sat Aug 21 10:51:54 2010
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -202,6 +202,7 @@ CONFIG_ARCH_RK2818=y
 # CONFIG_MACH_RK2818MID is not set
 # CONFIG_MACH_RK2818PHONE is not set
 CONFIG_MACH_RAHO=y
+# CONFIG_MACH_RK2818INFO is not set
 CONFIG_RK28_GPIO_IRQ=16
 CONFIG_RK28_ADC=y
 CONFIG_RK28_USB_WAKE=y
@@ -577,6 +578,7 @@ CONFIG_ANDROID_PMEM=y
 # CONFIG_KERNEL_DEBUGGER_CORE is not set
 # CONFIG_ISL29003 is not set
 CONFIG_UID_STAT=y
+# CONFIG_WL127X_RFKILL is not set
 CONFIG_APANIC=y
 CONFIG_APANIC_PLABEL="kpanic"
 # CONFIG_C2PORT is not set
@@ -638,12 +640,10 @@ CONFIG_DM9000_USE_NAND_CONTROL=y
 # CONFIG_NETDEV_10000 is not set
 CONFIG_WLAN=y
 # CONFIG_WLAN_PRE80211 is not set
-CONFIG_WLAN_80211=y
-CONFIG_LIBERTAS=y
-CONFIG_LIBERTAS_SDIO=y
-# CONFIG_LIBERTAS_SPI is not set
-# CONFIG_LIBERTAS_DEBUG is not set
-# CONFIG_HOSTAP is not set
+# CONFIG_WLAN_80211 is not set
+CONFIG_BCM4329=y
+CONFIG_BCM4329_FW_PATH="/etc/firmware/fw_bcm4329.bin"
+CONFIG_BCM4329_NVRAM_PATH="/etc/firmware/nvram_bcm4329_B23.txt"
 
 #
 # Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -733,6 +733,7 @@ CONFIG_TOUCHSCREEN_XPT2046_320X480_SPI=y
 # CONFIG_TOUCHSCREEN_TSC2007 is not set
 # CONFIG_TOUCHSCREEN_W90X900 is not set
 CONFIG_INPUT_MISC=y
+# CONFIG_INPUT_LPSENSOR_CM3602 is not set
 # CONFIG_INPUT_ATI_REMOTE is not set
 # CONFIG_INPUT_ATI_REMOTE2 is not set
 CONFIG_INPUT_KEYCHORD=y
@@ -839,6 +840,7 @@ CONFIG_SPI_FPGA_I2C=y
 # CONFIG_SPI_I2C_DEBUG is not set
 CONFIG_SPI_FPGA_DPRAM=y
 # CONFIG_SPI_DPRAM_DEBUG is not set
+# CONFIG_HEADSET_DET is not set
 
 #
 # PPS support
@@ -875,8 +877,11 @@ CONFIG_GPIOLIB=y
 # AC97 GPIO expanders:
 #
 # CONFIG_GPIO_PCA9554 is not set
+# CONFIG_IOEXTEND_TCA6424 is not set
 CONFIG_EXPANDED_GPIO_NUM=96
 CONFIG_EXPANDED_GPIO_IRQ_NUM=16
+CONFIG_SPI_FPGA_GPIO_NUM=96
+CONFIG_SPI_FPGA_GPIO_IRQ_NUM=16
 # CONFIG_W1 is not set
 CONFIG_POWER_SUPPLY=y
 # CONFIG_POWER_SUPPLY_DEBUG is not set
-- 
2.34.1