BT: for NH660

diff --git a/drivers/bluetooth/Kconfig b/drivers/bluetooth/Kconfig
index fdc472b7b2ab146ace0df225bf1de82c1dbb71ff..cceaab11a091c9c1615d6fc450956135cb015651 100755 (executable)
--- 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 d5815ac06955b63de1bee45770ae347cfc248389..dfcb9727a6a8abeaee30baa52d1cc6d800dc531c 100644 (file)
--- 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