diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2008-11-03 15:49:01 +0100 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2008-11-03 15:49:01 +0100 |
| commit | e856359685143a2f65876e7db4e4aa0ef5dce7f0 (patch) | |
| tree | bbcafe7f23975979f7a2bc6fd1404908d5fd7bd1 /arch/arm/mach-pxa/spitz_pm.c | |
| parent | [ARM] S3C24XX: Move mci.h to arch/arm/plat-s3c24xx/include/plat (diff) | |
| parent | Linux v2.6.28-rc3 (diff) | |
| download | linux-e856359685143a2f65876e7db4e4aa0ef5dce7f0.tar.xz linux-e856359685143a2f65876e7db4e4aa0ef5dce7f0.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into s3c-moves2
Diffstat (limited to 'arch/arm/mach-pxa/spitz_pm.c')
| -rw-r--r-- | arch/arm/mach-pxa/spitz_pm.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/spitz_pm.c b/arch/arm/mach-pxa/spitz_pm.c index 53018db106ac..072e77cfe5a3 100644 --- a/arch/arm/mach-pxa/spitz_pm.c +++ b/arch/arm/mach-pxa/spitz_pm.c @@ -198,7 +198,9 @@ struct sharpsl_charger_machinfo spitz_pm_machinfo = { .read_devdata = spitzpm_read_devdata, .charger_wakeup = spitz_charger_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, #endif .charge_on_volt = SHARPSL_CHARGE_ON_VOLT, |