diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-07-30 10:46:12 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-07-30 10:46:12 +0100 |
| commit | 5dbc80f69e131ecca42a5958b7785a57851c80d7 (patch) | |
| tree | 8de1ab7fbea2a342dd023ea836c570c7a95ef764 /arch/arm/mach-pxa/em-x270.c | |
| parent | 3ef7143d2287b21e09e00a25a8cb4fbdcf0c6c4c (diff) | |
| parent | 1d3e216f1d303878d7204de94dee251bc2702175 (diff) | |
Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6
Diffstat (limited to 'arch/arm/mach-pxa/em-x270.c')
| -rw-r--r-- | arch/arm/mach-pxa/em-x270.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/em-x270.c b/arch/arm/mach-pxa/em-x270.c index 63b10d9bb1d..9cd09465a0e 100644 --- a/arch/arm/mach-pxa/em-x270.c +++ b/arch/arm/mach-pxa/em-x270.c @@ -1141,12 +1141,16 @@ struct power_supply_info em_x270_psy_info = { static void em_x270_battery_low(void) { +#if defined(CONFIG_APM_EMULATION) apm_queue_event(APM_LOW_BATTERY); +#endif } static void em_x270_battery_critical(void) { +#if defined(CONFIG_APM_EMULATION) apm_queue_event(APM_CRITICAL_SUSPEND); +#endif } struct da9030_battery_info em_x270_batterty_info = { |