--- linux-2.6.12.4/drivers/macintosh/via-pmu.c.orig	2006-02-27 04:48:09.543115000 +0000
+++ linux-2.6.12.4/drivers/macintosh/via-pmu.c	2006-02-27 05:02:20.191115000 +0000
@@ -566,15 +566,9 @@
 	
 	/* Read server mode setting */
 	if (pmu_kind == PMU_KEYLARGO_BASED) {
-		pmu_request(&req, NULL, 2, PMU_POWER_EVENTS,
-			    PMU_PWR_GET_POWERUP_EVENTS);
-		pmu_wait_complete(&req);
-		if (req.reply_len == 2) {
-			if (req.reply[1] & PMU_PWR_WAKEUP_AC_INSERT)
-				option_server_mode = 1;
-			printk(KERN_INFO "via-pmu: Server Mode is %s\n",
-			       option_server_mode ? "enabled" : "disabled");
-		}
+		printk(KERN_INFO "via-pmu: enabling Server Mode... ");
+		pmu_set_server_mode(1);
+		printk("done\n");
 	}
 	return 1;
 }
@@ -1780,11 +1774,6 @@
 		pmu_request(&req, NULL, 2, PMU_SET_INTR_MASK, PMU_INT_ADB |
 						PMU_INT_TICK );
 		pmu_wait_complete(&req);
-	} else {
-		/* Disable server mode on shutdown or we'll just
-		 * wake up again
-		 */
-		pmu_set_server_mode(0);
 	}
 
 	pmu_request(&req, NULL, 5, PMU_SHUTDOWN,