mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 19:21:31 -04:00
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
This commit is contained in:
commit
7105212bd3
27 changed files with 94 additions and 95 deletions
|
|
@ -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,
|
||||
|
|
|
|||
Loading…
Reference in a new issue