diff options
author | Kristoffer Ericson <Kristoffer.Ericson@gmail.com> | 2007-09-10 23:43:33 -0400 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2007-09-20 22:57:52 -0400 |
commit | 8c8ee8254767d517907418d88492d4d91f10aca1 (patch) | |
tree | 5a6749064c6b683f2bf61e5c11ebf0898c16d0d0 /arch/sh/boards | |
parent | 9dd3f2205330a52674d7c015109813f639af0f14 (diff) |
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/sh/boards')
-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 d1c1460c8a06..640ca2a74f16 100644 --- a/arch/sh/boards/hp6xx/hp6xx_apm.c +++ b/arch/sh/boards/hp6xx/hp6xx_apm.c | |||
@@ -20,9 +20,9 @@ | |||
20 | #define APM_CRITICAL 10 | 20 | #define APM_CRITICAL 10 |
21 | #define APM_LOW 30 | 21 | #define APM_LOW 30 |
22 | 22 | ||
23 | #define HP680_BATTERY_MAX 875 | 23 | #define HP680_BATTERY_MAX 898 |
24 | #define HP680_BATTERY_MIN 600 | 24 | #define HP680_BATTERY_MIN 486 |
25 | #define HP680_BATTERY_AC_ON 900 | 25 | #define HP680_BATTERY_AC_ON 1023 |
26 | 26 | ||
27 | #define MODNAME "hp6x0_apm" | 27 | #define MODNAME "hp6x0_apm" |
28 | 28 | ||
@@ -65,7 +65,7 @@ static void hp6x0_apm_get_power_status(struct apm_power_info *info) | |||
65 | 65 | ||
66 | static irqreturn_t hp6x0_apm_interrupt(int irq, void *dev) | 66 | static irqreturn_t hp6x0_apm_interrupt(int irq, void *dev) |
67 | { | 67 | { |
68 | if (!apm_suspended) | 68 | if (!APM_DISABLED) |
69 | apm_queue_event(APM_USER_SUSPEND); | 69 | apm_queue_event(APM_USER_SUSPEND); |
70 | 70 | ||
71 | return IRQ_HANDLED; | 71 | return IRQ_HANDLED; |
@@ -91,7 +91,6 @@ static int __init hp6x0_apm_init(void) | |||
91 | static void __exit hp6x0_apm_exit(void) | 91 | static void __exit hp6x0_apm_exit(void) |
92 | { | 92 | { |
93 | free_irq(HP680_BTN_IRQ, 0); | 93 | free_irq(HP680_BTN_IRQ, 0); |
94 | apm_get_info = NULL; | ||
95 | } | 94 | } |
96 | 95 | ||
97 | module_init(hp6x0_apm_init); | 96 | module_init(hp6x0_apm_init); |