dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

[ARM] corgi_lcd: fix simultaneous compilation with corgi_bl 

corgi_lcd has symbol conflict with corgi_bl driver.
Fix it by renaming common symbol in new corgi_lcd driver.

Signed-off-by: Dmitry Baryshkov <dbaryshkov@gmail.com>
Signed-off-by: Eric Miao <eric.miao@marvell.com>
This commit is contained in:
Dmitry Baryshkov 2008-10-28 20:26:40 +03:00 committed by Eric Miao
parent b6e642e498
commit 5cbff9603a
4 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/mach-pxa/corgi_pm.c
View File

@ -204,7 +204,9 @@ static struct sharpsl_charger_machinfo corgi_pm_machinfo = {
.read_devdata = corgipm_read_devdata, .read_devdata = corgipm_read_devdata,
.charger_wakeup = corgi_charger_wakeup, .charger_wakeup = corgi_charger_wakeup,
.should_wakeup = corgi_should_wakeup, .should_wakeup = corgi_should_wakeup,
#ifdef CONFIG_BACKLIGHT_CORGI #if defined(CONFIG_LCD_CORGI)
.backlight_limit = corgi_lcd_limit_intensity,
#elif defined(CONFIG_BACKLIGHT_CORGI)
.backlight_limit = corgibl_limit_intensity, .backlight_limit = corgibl_limit_intensity,
#endif #endif
.charge_on_volt = SHARPSL_CHARGE_ON_VOLT, .charge_on_volt = SHARPSL_CHARGE_ON_VOLT,

1
arch/arm/mach-pxa/include/mach/sharpsl.h
View File

@ -26,6 +26,7 @@ struct corgits_machinfo {
* SharpSL Backlight * SharpSL Backlight
*/ */
extern void corgibl_limit_intensity(int limit); extern void corgibl_limit_intensity(int limit);
extern void corgi_lcd_limit_intensity(int limit);
/* /*

4
arch/arm/mach-pxa/spitz_pm.c
View File

@ -198,7 +198,9 @@ struct sharpsl_charger_machinfo spitz_pm_machinfo = {
.read_devdata = spitzpm_read_devdata, .read_devdata = spitzpm_read_devdata,
.charger_wakeup = spitz_charger_wakeup, .charger_wakeup = spitz_charger_wakeup,
.should_wakeup = spitz_should_wakeup, .should_wakeup = spitz_should_wakeup,
#ifdef CONFIG_BACKLIGHT_CORGI #if defined(CONFIG_LCD_CORGI)
.backlight_limit = corgi_lcd_limit_intensity,
#elif defined(CONFIG_BACKLIGHT_CORGI)
.backlight_limit = corgibl_limit_intensity, .backlight_limit = corgibl_limit_intensity,
#endif #endif
.charge_on_volt = SHARPSL_CHARGE_ON_VOLT, .charge_on_volt = SHARPSL_CHARGE_ON_VOLT,

4
drivers/video/backlight/corgi_lcd.c
View File

@ -439,7 +439,7 @@ static int corgi_bl_update_status(struct backlight_device *bd)
return corgi_bl_set_intensity(lcd, intensity); return corgi_bl_set_intensity(lcd, intensity);
} }
void corgibl_limit_intensity(int limit) void corgi_lcd_limit_intensity(int limit)
{ {
if (limit) if (limit)
corgibl_flags |= CORGIBL_BATTLOW; corgibl_flags |= CORGIBL_BATTLOW;
@ -448,7 +448,7 @@ void corgibl_limit_intensity(int limit)
backlight_update_status(the_corgi_lcd->bl_dev); backlight_update_status(the_corgi_lcd->bl_dev);
} }
EXPORT_SYMBOL(corgibl_limit_intensity); EXPORT_SYMBOL(corgi_lcd_limit_intensity);
static struct backlight_ops corgi_bl_ops = { static struct backlight_ops corgi_bl_ops = {
.get_brightness = corgi_bl_get_intensity, .get_brightness = corgi_bl_get_intensity,