rk29: sdk: refactor rfkill code

diff --git a/arch/arm/mach-rk29/board-rk29-ddr3sdk.c b/arch/arm/mach-rk29/board-rk29-ddr3sdk.c
index fd8a01c80ab0caa70b1d744e92c9df50f0311e61..91fc6b5301cd60fcfa33331328cdb1a9e73474fa 100755 (executable)
--- a/arch/arm/mach-rk29/board-rk29-ddr3sdk.c
+++ b/arch/arm/mach-rk29/board-rk29-ddr3sdk.c
@@ -2939,6 +2939,9 @@ static struct platform_device *devices[] __initdata = {
 #ifdef CONFIG_SND_RK29_SOC_CS42L52
        &rk29_cs42l52_device,
 #endif
+#ifdef CONFIG_RFKILL_RK
+       &device_rfkill_rk,
+#endif
 };
 
 /*****************************************************************************************

diff --git a/arch/arm/mach-rk29/devices.c b/arch/arm/mach-rk29/devices.c
index 26cdb9cbd548008e519f8755e709211ca9946ecb..779a9f13786c62db65b6d3a1aca4c6055cd80338 100644 (file)
--- a/arch/arm/mach-rk29/devices.c
+++ b/arch/arm/mach-rk29/devices.c
@@ -884,10 +884,6 @@ static int __init rk29_init_devices(void)
 {
        platform_device_register(&rk29_device_pmu);
        platform_device_register(&rk29_device_pcm);
-#ifdef CONFIG_BT
-    extern struct platform_device device_rfkill_rk;
-    platform_device_register(&device_rfkill_rk);
-#endif
         return 0;
 }
 arch_initcall(rk29_init_devices);