diff options
| author | Dmitry Baryshkov <dbaryshkov@gmail.com> | 2008-10-28 18:26:40 +0100 |
|---|---|---|
| committer | Eric Miao <eric.miao@marvell.com> | 2008-10-29 04:45:37 +0100 |
| commit | 5cbff9603a77d01315859690a8f125f817bed73b (patch) | |
| tree | e1cd38172438e732542222a81bc308ef47275c5a /drivers/video | |
| parent | [ARM] pxa/spitz: fix spi cs on spitz (diff) | |
| download | linux-5cbff9603a77d01315859690a8f125f817bed73b.tar.xz linux-5cbff9603a77d01315859690a8f125f817bed73b.zip | |
[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>
Diffstat (limited to 'drivers/video')
| -rw-r--r-- | drivers/video/backlight/corgi_lcd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/backlight/corgi_lcd.c b/drivers/video/backlight/corgi_lcd.c index 2afd47eefe74..f8a4bb20f41a 100644 --- a/drivers/video/backlight/corgi_lcd.c +++ b/drivers/video/backlight/corgi_lcd.c @@ -439,7 +439,7 @@ static int corgi_bl_update_status(struct backlight_device *bd) return corgi_bl_set_intensity(lcd, intensity); } -void corgibl_limit_intensity(int limit) +void corgi_lcd_limit_intensity(int limit) { if (limit) corgibl_flags |= CORGIBL_BATTLOW; @@ -448,7 +448,7 @@ void corgibl_limit_intensity(int limit) 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 = { .get_brightness = corgi_bl_get_intensity, |