---

yaml --- r: 207869 b: refs/heads/master c: d643e2d h: refs/heads/master i: 207867: 1feb0c0 v: v3
git-mirror · Aug 9, 2010 · d7f846e · d7f846e
1 parent 17a0e1f
commit d7f846e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1b460102323a08874e942a330b896c30d50ab235
+refs/heads/master: d643e2d2cc1d1f37751a99a7c4cb30064cc68aac
diff --git a/trunk/arch/m68k/mac/misc.c b/trunk/arch/m68k/mac/misc.c
@@ -91,7 +91,7 @@ static void cuda_write_pram(int offset, __u8 data)
 #define cuda_write_pram NULL
 #endif
 
-#if 0 /* def CONFIG_ADB_PMU68K */
+#ifdef CONFIG_ADB_PMU68K
 static long pmu_read_time(void)
 {
 	struct adb_request req;
@@ -102,8 +102,8 @@ static long pmu_read_time(void)
 	while (!req.complete)
 		pmu_poll();
 
-	time = (req.reply[0] << 24) | (req.reply[1] << 16)
-		| (req.reply[2] << 8) | req.reply[3];
+	time = (req.reply[1] << 24) | (req.reply[2] << 16)
+		| (req.reply[3] << 8) | req.reply[4];
 	return time - RTC_OFFSET;
 }