Update of /cvsroot/linuxconsole/ruby/linux/arch/m68k/mac
In directory usw-pr-cvs1:/tmp/cvs-serv14367/linux/arch/m68k/mac
Modified Files:
config.c
Log Message:
Synced to 2.5.15
Index: config.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/arch/m68k/mac/config.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- config.c 15 Mar 2002 19:01:08 -0000 1.1
+++ config.c 16 May 2002 18:01:37 -0000 1.2
@@ -61,9 +61,8 @@
unsigned long mac_orig_videoaddr;
/* Mac specific timer functions */
-extern void mac_gettod (int *, int *, int *, int *, int *, int *);
extern unsigned long mac_gettimeoffset (void);
-extern int mac_hwclk (int, struct hwclk_time *);
+extern int mac_hwclk (int, struct rtc_time *);
extern int mac_set_clock_mmss (unsigned long);
extern int show_mac_interrupts(struct seq_file *, void *);
extern void iop_preinit(void);
@@ -216,8 +215,10 @@
mach_default_handler = &mac_handlers;
mach_get_irq_list = show_mac_interrupts;
mach_gettimeoffset = mac_gettimeoffset;
- mach_gettod = mac_gettod;
+#warning move to adb/via init
+#if 0
mach_hwclk = mac_hwclk;
+#endif
mach_set_clock_mmss = mac_set_clock_mmss;
mach_reset = mac_reset;
mach_halt = mac_poweroff;
|
