From: root <root@roger-desktop.(none)>
Date: Mon, 9 Aug 2010 03:39:11 +0000 (+0800)
Subject: modify rk2818_raho_deconfig for bcm4329 bt
X-Git-Tag: firefly_0821_release~11292
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=320c4382625678861b8554da01a1644511046582;p=firefly-linux-kernel-4.4.55.git

modify rk2818_raho_deconfig for bcm4329 bt
---

diff --git a/arch/arm/configs/rk2818_raho_defconfig b/arch/arm/configs/rk2818_raho_defconfig
old mode 100644
new mode 100755
index 0c279cf7cfb5..13632b8e73e5
--- a/arch/arm/configs/rk2818_raho_defconfig
+++ b/arch/arm/configs/rk2818_raho_defconfig
@@ -435,6 +435,7 @@ CONFIG_BT_HCIUART_H4=y
 # CONFIG_BT_HCIUART_LL is not set
 # CONFIG_BT_HCIVHCI is not set
 # CONFIG_BT_MRVL is not set
+CONFIG_BT_HCIBCM4325=y
 # CONFIG_AF_RXRPC is not set
 CONFIG_WIRELESS=y
 # CONFIG_CFG80211 is not set
@@ -449,7 +450,9 @@ CONFIG_LIB80211=y
 # CFG80211 needs to be enabled for MAC80211
 #
 # CONFIG_WIMAX is not set
-# CONFIG_RFKILL is not set
+CONFIG_RFKILL=y
+CONFIG_RFKILL_PM=y
+# CONFIG_RFKILL_INPUT is not set
 # CONFIG_NET_9P is not set
 
 #