diff options
| author | Kristoffer Ericson <Kristoffer.Ericson@gmail.com> | 2007-09-11 12:43:33 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2007-09-21 11:57:52 +0900 |
| commit | 8c8ee8254767d517907418d88492d4d91f10aca1 (patch) | |
| tree | 5a6749064c6b683f2bf61e5c11ebf0898c16d0d0 /arch | |
| parent | 9dd3f2205330a52674d7c015109813f639af0f14 (diff) | |
| download | op-kernel-dev-8c8ee8254767d517907418d88492d4d91f10aca1.zip op-kernel-dev-8c8ee8254767d517907418d88492d4d91f10aca1.tar.gz | |
sh: hp6xx: APM build fix and new battery values.
Build fixes for the hp6xx APM code, as well as some adjustments for
the battery values.
Signed-off-by: Kristoffer Ericson <Kristoffer.Ericson@gmail.com>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/sh/boards/hp6xx/hp6xx_apm.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/arch/sh/boards/hp6xx/hp6xx_apm.c b/arch/sh/boards/hp6xx/hp6xx_apm.c index d1c1460..640ca2a 100644 --- a/arch/sh/boards/hp6xx/hp6xx_apm.c +++ b/arch/sh/boards/hp6xx/hp6xx_apm.c @@ -20,9 +20,9 @@ #define APM_CRITICAL 10 #define APM_LOW 30 -#define HP680_BATTERY_MAX 875 -#define HP680_BATTERY_MIN 600 -#define HP680_BATTERY_AC_ON 900 +#define HP680_BATTERY_MAX 898 +#define HP680_BATTERY_MIN 486 +#define HP680_BATTERY_AC_ON 1023 #define MODNAME "hp6x0_apm" @@ -65,7 +65,7 @@ static void hp6x0_apm_get_power_status(struct apm_power_info *info) static irqreturn_t hp6x0_apm_interrupt(int irq, void *dev) { - if (!apm_suspended) + if (!APM_DISABLED) apm_queue_event(APM_USER_SUSPEND); return IRQ_HANDLED; @@ -91,7 +91,6 @@ static int __init hp6x0_apm_init(void) static void __exit hp6x0_apm_exit(void) { free_irq(HP680_BTN_IRQ, 0); - apm_get_info = NULL; } module_init(hp6x0_apm_init); |
