---

yaml --- r: 56043 b: refs/heads/master c: 34eac2a h: refs/heads/master i: 56041: ae6fa25 56039: a47e471 v: v3
git-mirror · May 10, 2007 · 6c59f4b · 6c59f4b
1 parent 4e4a81c
commit 6c59f4b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9a86bbb90f3c42e10fce2b9634961ec18f5ca2cb
+refs/heads/master: 34eac2abcba1c07c47bfff86701a4f80f5553fa6
diff --git a/trunk/arch/ia64/kernel/mca.c b/trunk/arch/ia64/kernel/mca.c
@@ -118,7 +118,9 @@ static ia64_mc_info_t		ia64_mc_info;
 #define CPE_HISTORY_LENGTH    5
 #define CMC_HISTORY_LENGTH    5
 
+#ifdef CONFIG_ACPI
 static struct timer_list cpe_poll_timer;
+#endif
 static struct timer_list cmc_poll_timer;
 /*
  * This variable tells whether we are currently in polling mode.