From 9739072fe6080f4ddee8cccdc9d0c5a397882548 Mon Sep 17 00:00:00 2001
From: Kristoffer Ericson <Kristoffer.Ericson@gmail.com>
Date: Tue, 11 Sep 2007 12:43:33 +0900
Subject: [PATCH] --- yaml --- r: 68242 b: refs/heads/master c:
 8c8ee8254767d517907418d88492d4d91f10aca1 h: refs/heads/master v: v3

---
 [refs]                                 | 2 +-
 trunk/arch/sh/boards/hp6xx/hp6xx_apm.c | 9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index ef318df0f563..867c6cdedaff 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9dd3f2205330a52674d7c015109813f639af0f14
+refs/heads/master: 8c8ee8254767d517907418d88492d4d91f10aca1
diff --git a/trunk/arch/sh/boards/hp6xx/hp6xx_apm.c b/trunk/arch/sh/boards/hp6xx/hp6xx_apm.c
index d1c1460c8a06..640ca2a74f16 100644
--- a/trunk/arch/sh/boards/hp6xx/hp6xx_apm.c
+++ b/trunk/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);