From 0595453b520dc67490cb9c40451a6b417b1a0c67 Mon Sep 17 00:00:00 2001
From: Parag Warudkar <parag.warudkar@gmail.com>
Date: Wed, 2 May 2007 19:27:10 +0200
Subject: [PATCH] --- yaml --- r: 53811 b: refs/heads/master c:
 78eea47ac3e256559d97f0c2434928be39cba524 h: refs/heads/master i:   53809:
 a56a748c834077665efcdc1379073d6738dbe8c5   53807:
 34b39274a56041baffbbc7ac202fea639f35b4a2 v: v3

---
 [refs]                       | 2 +-
 trunk/arch/i386/kernel/apm.c | 7 -------
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 9fcde4d91e84..32f7fe48d794 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6fb14755a676282a4e6caa05a08c92db8e45cfff
+refs/heads/master: 78eea47ac3e256559d97f0c2434928be39cba524
diff --git a/trunk/arch/i386/kernel/apm.c b/trunk/arch/i386/kernel/apm.c
index 064bbf2861f4..4d073d390715 100644
--- a/trunk/arch/i386/kernel/apm.c
+++ b/trunk/arch/i386/kernel/apm.c
@@ -384,13 +384,6 @@ static int			ignore_sys_suspend;
 static int			ignore_normal_resume;
 static int			bounce_interval __read_mostly = DEFAULT_BOUNCE_INTERVAL;
 
-#ifdef CONFIG_APM_RTC_IS_GMT
-#	define	clock_cmos_diff	0
-#	define	got_clock_diff	1
-#else
-static long			clock_cmos_diff;
-static int			got_clock_diff;
-#endif
 static int			debug __read_mostly;
 static int			smp __read_mostly;
 static int			apm_disabled = -1;