patchlet: arch/ppc/kernel/pmac_time.c

From: Bernd Kischnick (kisch@mindless.com)
Date: Mon Aug 14 2000 - 20:10:50 EST


Hello,

here's a trivial patch against 2.4.0-test6 for the PowerMac-port.
It inserts some config-#ifdefs which have been missing for some
"test"-versions.

- Bernd

--- v2.4.0-test6/linux/arch/ppc/kernel/pmac_time.c.orig Sun Aug 13 15:14:31 2000
+++ v2.4.0-test6/linux/arch/ppc/kernel/pmac_time.c Sun Aug 13 15:16:17 2000
@@ -118,11 +118,14 @@
 
 int pmac_set_rtc_time(unsigned long nowtime)
 {
+#ifdef CONFIG_ADB
         struct adb_request req;
+#endif
 
         nowtime += RTC_OFFSET - sys_tz.tz_minuteswest * 60;
 
         switch (sys_ctrler) {
+#ifdef CONFIG_ADB_CUDA
         case SYS_CTRLER_CUDA:
                 if (cuda_request(&req, NULL, 6, CUDA_PACKET, CUDA_SET_TIME,
                                  nowtime >> 24, nowtime >> 16, nowtime >> 8, nowtime) < 0)
@@ -133,6 +136,8 @@
                         printk(KERN_ERR "pmac_set_rtc_time: got %d byte reply\n",
                                req.reply_len);
                 return 1;
+#endif /* CONFIG_ADB_CUDA */
+#ifdef CONFIG_ADB_PMU
         case SYS_CTRLER_PMU:
                 if (pmu_request(&req, NULL, 5, PMU_SET_RTC,
                                 nowtime >> 24, nowtime >> 16, nowtime >> 8, nowtime) < 0)
@@ -143,6 +148,7 @@
                         printk(KERN_ERR "pmac_set_rtc_time: got %d byte reply\n",
                                req.reply_len);
                 return 1;
+#endif /* CONFIG_ADB_PMU */
         default:
                 return 0;
         }

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.rutgers.edu
Please read the FAQ at http://www.tux.org/lkml/



This archive was generated by hypermail 2b29 : Tue Aug 15 2000 - 21:00:35 EST