summaryrefslogtreecommitdiff
blob: 7c760eab2ac33d6e18ac1db54bd7224c4efe751a (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
diff -Naur linux-2.4.22.orig/drivers/macintosh/via-pmu.c linux-2.4.22/drivers/macintosh/via-pmu.c
--- linux-2.4.22.orig/drivers/macintosh/via-pmu.c	2003-10-26 13:11:39.000000000 +0100
+++ linux-2.4.22/drivers/macintosh/via-pmu.c	2003-10-26 13:11:24.000000000 +0100
@@ -477,7 +477,9 @@
 	/* Create /proc/pmu */
 	proc_pmu_root = proc_mkdir("pmu", 0);
 	if (proc_pmu_root) {
+#ifdef CONFIG_PMAC_PBOOK
 		int i;
+#endif
 		proc_pmu_info = create_proc_read_entry("info", 0, proc_pmu_root,
 					proc_get_info, NULL);
 		proc_pmu_irqstats = create_proc_read_entry("interrupts", 0, proc_pmu_root,
@@ -1373,8 +1375,8 @@
 #endif /* CONFIG_PMAC_BACKLIGHT */
 		}
 	/* Tick interrupt */
-	else if ((1 << pirq) & PMU_INT_TICK) {
 #ifdef CONFIG_PMAC_PBOOK
+	else if ((1 << pirq) & PMU_INT_TICK) {
 		/* Environement or tick interrupt, query batteries */
 		if (pmu_battery_count) {
 			if ((--query_batt_timer) == 0) {