From: CMY <cmy@rock-chips.com>
Date: Mon, 6 Aug 2012 07:19:18 +0000 (+0800)
Subject: BT: for NH660
X-Git-Tag: firefly_0821_release~8928
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=d18a181849e903e4a312040364f5c8fae7a03ce2;p=firefly-linux-kernel-4.4.55.git

BT: for NH660
---

diff --git a/drivers/bluetooth/Kconfig b/drivers/bluetooth/Kconfig
index fdc472b7b2ab..cceaab11a091 100755
--- a/drivers/bluetooth/Kconfig
+++ b/drivers/bluetooth/Kconfig
@@ -257,4 +257,15 @@ config BT_WILINK
 
 	  Say Y here to compile support for Texas Instrument's WiLink7 driver
 	  into the kernel or say M to compile it as module.
+
+if BCM4330
+choice
+        prompt "Select the bluetooth module"
+        default BT_MODULE_NH660
+
+        config BT_MODULE_NH660
+        bool "AzureWave NH660"
+endchoice
+endif
+
 endmenu
diff --git a/net/rfkill/rfkill-rk.c b/net/rfkill/rfkill-rk.c
index d5815ac06955..dfcb9727a6a8 100644
--- a/net/rfkill/rfkill-rk.c
+++ b/net/rfkill/rfkill-rk.c
@@ -103,7 +103,13 @@ struct rfkill_rk_data {
 static struct rfkill_rk_data *g_rfkill = NULL;
 
 static const char bt_name[] = 
-#if defined(CONFIG_RKWIFI)
+#if defined (CONFIG_BCM4330)
+    #if defined (CONFIG_BT_MODULE_NH660)
+        "nh660"
+    #else
+        "bcm4330"
+    #endif
+#elif defined (CONFIG_RK903)
     #if defined(CONFIG_RKWIFI_26M)
         "rk903_26M"
     #else