From f29ef1ff8bff7b33443c9cdfd41f9ccbe31bbb91 Mon Sep 17 00:00:00 2001
From: CMY <cmy@rock-chips.com>
Date: Wed, 9 May 2012 15:57:00 +0800
Subject: [PATCH] rkwifi: change config name for 26M and 37.4M, and update bt
 chip name

---
 arch/arm/mach-rk30/board-rk30-sdk-rfkill.c   | 6 +++++-
 drivers/net/wireless/Kconfig                 | 6 +++---
 drivers/net/wireless/rkwifi/rk_wifi_config.c | 8 ++++----
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/arch/arm/mach-rk30/board-rk30-sdk-rfkill.c b/arch/arm/mach-rk30/board-rk30-sdk-rfkill.c
index dcfd5c0bf42a..459aad062029 100755
--- a/arch/arm/mach-rk30/board-rk30-sdk-rfkill.c
+++ b/arch/arm/mach-rk30/board-rk30-sdk-rfkill.c
@@ -73,7 +73,11 @@ struct bt_ctrl
 
 static const char bt_name[] = 
 #if defined(CONFIG_RKWIFI)
-    "rk903"
+    #if defined(CONFIG_RKWIFI_26M)
+        "rk903_26M"
+    #else
+        "rk903"
+    #endif
 #elif defined(CONFIG_BCM4329)
     "bcm4329"
 #elif defined(CONFIG_MV8787)
diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig
index d77df10c3b87..e3abd49317a2 100644
--- a/drivers/net/wireless/Kconfig
+++ b/drivers/net/wireless/Kconfig
@@ -100,13 +100,13 @@ endchoice
 choice	
 	depends on RKWIFI && WLAN_80211
 	prompt "Select the wifi module crystal freq"
-	default 37_4M
+	default RKWIFI_37_4M
 
-	config 37_4M
+	config RKWIFI_37_4M
     	bool "37_4M"
 	    depends on RKWIFI && WLAN_80211
 
-	config 26M
+	config RKWIFI_26M
     	bool "26M"
 	    depends on RKWIFI && WLAN_80211
 
diff --git a/drivers/net/wireless/rkwifi/rk_wifi_config.c b/drivers/net/wireless/rkwifi/rk_wifi_config.c
index 12471adb4b8e..df19f33e17e7 100644
--- a/drivers/net/wireless/rkwifi/rk_wifi_config.c
+++ b/drivers/net/wireless/rkwifi/rk_wifi_config.c
@@ -33,20 +33,20 @@ int rkwifi_set_firmware(char *fw, char *nvram)
 {
 #ifdef CONFIG_RK903
 	sprintf(fw, "%s%s", ANDROID_FW_PATH, "fw_RK903.bin");
-#ifdef CONFIG_26M
+#ifdef CONFIG_RKWIFI_26M
 	sprintf(nvram, "%s%s", ANDROID_FW_PATH, "nvram_RK903_26M.cal");
 #endif
-#ifdef CONFIG_37_4M	
+#ifdef CONFIG_RKWIFI_37_4M	
 	sprintf(nvram, "%s%s", ANDROID_FW_PATH, "nvram_RK903.cal");
 #endif	
 #endif	
 
 #ifdef CONFIG_RK901
 	sprintf(fw, "%s%s", ANDROID_FW_PATH, "fw_RK901.bin");
-#ifdef CONFIG_26M
+#ifdef CONFIG_RKWIFI_26M
 	sprintf(nvram, "%s%s", ANDROID_FW_PATH, "nvram_RK901_26M.txt");
 #endif
-#ifdef CONFIG_37_4M
+#ifdef CONFIG_RKWIFI_37_4M
 	sprintf(nvram, "%s%s", ANDROID_FW_PATH, "nvram_RK901.txt");
 #endif
 #endif
-- 
2.34.1