xxm FIH:revertarch/arm/mach-rk29/devices.c arch/arm/mach-rk29/devices.h TO rk29sdk

diff --git a/arch/arm/mach-rk29/board-rk29-fih.c b/arch/arm/mach-rk29/board-rk29-fih.c
index e4a70308a16d3d1896c29b7eb11b5a8e934afc05..41360f1f172a63d7d0259e2dc6355b26e5c82855 100755 (executable)
--- a/arch/arm/mach-rk29/board-rk29-fih.c
+++ b/arch/arm/mach-rk29/board-rk29-fih.c
@@ -1637,7 +1637,15 @@ struct rk29_bl_info fih_touchkey_led_info = {
     .pwm_resume = fih_touchkey_led_pwm_resume,
 };
 #endif
-
+#ifdef CONFIG_FIH_TOUCHKEY_LED
+struct platform_device fih_touchkey_led = {
+               .name   = "fih_touchkey_led",
+               .id     = -1,
+        .dev    = {
+           .platform_data  = &fih_touchkey_led_info,
+        }
+};
+#endif
 /*****************************************************************************************
 * pwm voltage regulator devices
 ******************************************************************************************/

diff --git a/arch/arm/mach-rk29/devices.c b/arch/arm/mach-rk29/devices.c
index 884662077b02412506d47112aeed80815d7a76a1..fc2258670367e6c8e5c86073b2bf99db9eed732e 100755 (executable)
--- a/arch/arm/mach-rk29/devices.c
+++ b/arch/arm/mach-rk29/devices.c
@@ -178,15 +178,6 @@ struct platform_device rk29_device_backlight = {
         }
 };
 #endif
-#ifdef CONFIG_FIH_TOUCHKEY_LED
-struct platform_device fih_touchkey_led = {
-               .name   = "fih_touchkey_led",
-               .id     = -1,
-        .dev    = {
-           .platform_data  = &fih_touchkey_led_info,
-        }
-};
-#endif
 #ifdef CONFIG_SDMMC0_RK29 
 #ifndef CONFIG_EMMC_RK29 
 static struct resource resources_sdmmc0[] = {

diff --git a/arch/arm/mach-rk29/devices.h b/arch/arm/mach-rk29/devices.h
index 11666dc407e039a5cc3552d501892dda9dd8b386..1c538077cbe092dd23c2c715281e999311e40246 100755 (executable)
--- a/arch/arm/mach-rk29/devices.h
+++ b/arch/arm/mach-rk29/devices.h
@@ -51,8 +51,6 @@ extern struct platform_device rk29_device_adc;
 extern struct platform_device rk29_device_vmac;
 extern struct rk29_bl_info    rk29_bl_info;
 extern struct platform_device rk29_device_backlight;
-extern struct rk29_bl_info       fih_touchkey_led_info;
-extern struct platform_device fih_touchkey_led;
 extern struct platform_device rk29_device_usb20_otg;
 extern struct platform_device rk29_device_usb20_host;
 extern struct platform_device rk29_device_usb11_host;

diff --git a/drivers/video/backlight/fih_touchkey_led.c b/drivers/video/backlight/fih_touchkey_led.c
index bfd540afae0203f5b793a75384c27cc01a6bbc71..256ff06c91306447d5c237e9a0abbfee4ef65526 100644 (file)
--- a/drivers/video/backlight/fih_touchkey_led.c
+++ b/drivers/video/backlight/fih_touchkey_led.c
@@ -33,7 +33,7 @@
 /*
  * Debug
  */
-#if 1
+#if 0
 #define DBG(x...)      printk(KERN_INFO x)
 #else
 #define DBG(x...)