diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-30 19:16:39 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-30 19:16:39 -0400 |
| commit | 7105212bd309752b589a3ba816afdd7fed190b85 (patch) | |
| tree | 812d86441f8ba375f04c38c569908bd3f61e1c26 /drivers/video | |
| parent | 65fc716fa673cf98fb5887180fd3c52ca0371198 (diff) | |
| parent | b73b925a6b9d69478c6ae4e74ef20607fd24aeaa (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] 5326/1: AFEB9260: Fix for i2c_board_info structure
[ARM] mx31ads: Add missing include
[ARM] MXC: Fix mxc_gpio_get(), which must read PSR register instead DR.
[ARM] MX3: Use ioremap wrapper to map SoC devices nonshared
[ARM] gpio_free might sleep, arm architecture
[ARM] ep93xx: fix OHCI DMA mask
leds: da903x: (da9030 only) led brightness reversed.
[ARM] sharpsl_pm: fix compilation w/o CONFIG_PM
[ARM] pcm037: map AIPS1 and AIPS2 as nonshared area
[ARM] build fixes for netX serial driver
[ARM] 5323/1: Remove outdated empeg documentation.
[ARM] 5299/1: Add maintainer for Mobilepro 900/c
[ARM] corgi_lcd: fix simultaneous compilation with corgi_bl
[ARM] pxa/spitz: fix spi cs on spitz
[ARM] 5322/1: Fix fastpath issue in mmci.c
[ARM] xsc3: revert writethrough memory-type encoding change
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) | |||
| 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, |