diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-04-20 12:15:32 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-05-19 11:25:57 -0400 |
commit | 02a8e76979f9b439642e67955edb865c112926f6 (patch) | |
tree | a4465fc5c6ce78931e165ec7736ad9ff273e3851 /arch/arm/mach-pxa/corgi_pm.c | |
parent | b8291ad07a7f3b5b990900f0001198ac23ba893e (diff) |
[ARM] pxa: corgibl_limit_intensity build errors
If CONFIG_BACKLIGHT_CORGI is not selected, then corgibl_limit_intensity()
is not present. However, both corgi_pm.c and sharp_pm.c reference this
symbol, resulting in a link error.
Wrap the references with the relevant ifdefs, and avoid the resulting
NULL pointer dereference by making the code in sharpsl_pm.c also
conditional on the config symbol.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-pxa/corgi_pm.c')
-rw-r--r-- | arch/arm/mach-pxa/corgi_pm.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/corgi_pm.c b/arch/arm/mach-pxa/corgi_pm.c index 0a85f706e88..ae91c4b1135 100644 --- a/arch/arm/mach-pxa/corgi_pm.c +++ b/arch/arm/mach-pxa/corgi_pm.c | |||
@@ -204,7 +204,9 @@ static struct sharpsl_charger_machinfo corgi_pm_machinfo = { | |||
204 | .read_devdata = corgipm_read_devdata, | 204 | .read_devdata = corgipm_read_devdata, |
205 | .charger_wakeup = corgi_charger_wakeup, | 205 | .charger_wakeup = corgi_charger_wakeup, |
206 | .should_wakeup = corgi_should_wakeup, | 206 | .should_wakeup = corgi_should_wakeup, |
207 | #ifdef CONFIG_BACKLIGHT_CORGI | ||
207 | .backlight_limit = corgibl_limit_intensity, | 208 | .backlight_limit = corgibl_limit_intensity, |
209 | #endif | ||
208 | .charge_on_volt = SHARPSL_CHARGE_ON_VOLT, | 210 | .charge_on_volt = SHARPSL_CHARGE_ON_VOLT, |
209 | .charge_on_temp = SHARPSL_CHARGE_ON_TEMP, | 211 | .charge_on_temp = SHARPSL_CHARGE_ON_TEMP, |
210 | .charge_acin_high = SHARPSL_CHARGE_ON_ACIN_HIGH, | 212 | .charge_acin_high = SHARPSL_CHARGE_ON_ACIN_HIGH, |