diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-11-03 02:57:41 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-03 02:57:41 -0500 |
| commit | db5935001a43528e673ad26ffec9d98c60a496a9 (patch) | |
| tree | 8e735327a97beccabb5d94ef93df25d2bacda705 /drivers/video/backlight | |
| parent | 34f3a814eef8069a24e5b3ebcf27aba9dabac2ea (diff) | |
| parent | 45beca08dd8b6d6a65c5ffd730af2eac7a2c7a03 (diff) | |
Merge commit 'v2.6.28-rc3' into sched/core
Diffstat (limited to 'drivers/video/backlight')
| -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) | |||
| 439 | return corgi_bl_set_intensity(lcd, intensity); | 439 | return corgi_bl_set_intensity(lcd, intensity); |
| 440 | } | 440 | } |
| 441 | 441 | ||
| 442 | void corgibl_limit_intensity(int limit) | 442 | void corgi_lcd_limit_intensity(int limit) |
| 443 | { | 443 | { |
| 444 | if (limit) | 444 | if (limit) |
| 445 | corgibl_flags |= CORGIBL_BATTLOW; | 445 | corgibl_flags |= CORGIBL_BATTLOW; |
| @@ -448,7 +448,7 @@ void corgibl_limit_intensity(int limit) | |||
| 448 | 448 | ||
| 449 | backlight_update_status(the_corgi_lcd->bl_dev); | 449 | backlight_update_status(the_corgi_lcd->bl_dev); |
| 450 | } | 450 | } |
| 451 | EXPORT_SYMBOL(corgibl_limit_intensity); | 451 | EXPORT_SYMBOL(corgi_lcd_limit_intensity); |
| 452 | 452 | ||
| 453 | static struct backlight_ops corgi_bl_ops = { | 453 | static struct backlight_ops corgi_bl_ops = { |
| 454 | .get_brightness = corgi_bl_get_intensity, | 454 | .get_brightness = corgi_bl_get_intensity, |