change rfkill's name by wifi/bt chip

diff --git a/arch/arm/mach-rk30/board-rk30-phone-rfkill.c b/arch/arm/mach-rk30/board-rk30-phone-rfkill.c
index 193c6472f5a871e61a861596fd4c2df4f0658e03..179a1cd8d22618cf98a4a33f523705d50897554e 100755 (executable)
--- a/arch/arm/mach-rk30/board-rk30-phone-rfkill.c
+++ b/arch/arm/mach-rk30/board-rk30-phone-rfkill.c
@@ -59,7 +59,18 @@ struct bt_ctrl
 #define BT_WAKE_LOCK_TIMEOUT    10 //s
 #endif
 
-static const char bt_name[] = "bcm4329";
+static const char bt_name[] = 
+#if defined(CONFIG_RKWIFI)
+    "rk903"
+#elif defined(CONFIG_BCM4329)
+    "bcm4329"
+#elif defined(CONFIG_MV8787)
+    "mv8787"
+#else
+    "bt_default"
+#endif
+;
+
 extern int rk29sdk_bt_power_state;
 extern int rk29sdk_wifi_power_state;
 

diff --git a/arch/arm/mach-rk30/board-rk30-sdk-rfkill.c b/arch/arm/mach-rk30/board-rk30-sdk-rfkill.c
index faeb3b717a71b99bed5d99d46255eecb083af069..8250806d6e6cb6f66a0ea509fd813a8dff7c4640 100755 (executable)
--- a/arch/arm/mach-rk30/board-rk30-sdk-rfkill.c
+++ b/arch/arm/mach-rk30/board-rk30-sdk-rfkill.c
@@ -64,7 +64,18 @@ struct bt_ctrl
 #define BT_WAKE_LOCK_TIMEOUT    10 //s
 #endif
 
-static const char bt_name[] = "bcm4330";
+static const char bt_name[] = 
+#if defined(CONFIG_RKWIFI)
+    "rk903"
+#elif defined(CONFIG_BCM4329)
+    "bcm4329"
+#elif defined(CONFIG_MV8787)
+    "mv8787"
+#else
+    "bt_default"
+#endif
+;
+
 //extern int rk29sdk_bt_power_state;
 //extern int rk29sdk_wifi_power_state;