From 3271229f8c6c905e5c26a6e7f30815318038566d Mon Sep 17 00:00:00 2001 From: root Date: Thu, 28 Apr 2011 14:50:18 +0800 Subject: [PATCH] xxm FIH:revertarch/arm/mach-rk29/devices.c arch/arm/mach-rk29/devices.h TO rk29sdk --- arch/arm/mach-rk29/board-rk29-fih.c | 10 +++++++++- arch/arm/mach-rk29/devices.c | 9 --------- arch/arm/mach-rk29/devices.h | 2 -- drivers/video/backlight/fih_touchkey_led.c | 2 +- 4 files changed, 10 insertions(+), 13 deletions(-) diff --git a/arch/arm/mach-rk29/board-rk29-fih.c b/arch/arm/mach-rk29/board-rk29-fih.c index e4a70308a16d..41360f1f172a 100755 --- 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 884662077b02..fc2258670367 100755 --- 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 11666dc407e0..1c538077cbe0 100755 --- 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 bfd540afae02..256ff06c9130 100644 --- 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...) -- 2.34.1