[Linuxconsole-commit]CVS: ruby/linux/include/asm-m68k machdep.h,1.1,1.2

[James S. <jsi...@us...>]

Update of /cvsroot/linuxconsole/ruby/linux/include/asm-m68k
In directory usw-pr-cvs1:/tmp/cvs-serv14367/linux/include/asm-m68k

Modified Files:
	machdep.h 
Log Message:
Synced to 2.5.15

Index: machdep.h
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/include/asm-m68k/machdep.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- machdep.h	16 Mar 2002 16:36:10 -0000	1.1
+++ machdep.h	16 May 2002 18:01:39 -0000	1.2
@@ -5,7 +5,7 @@
 
 struct pt_regs;
 struct mktime;
-struct hwclk_time;
+struct rtc_time;
 struct buffer_head;
 
 extern void (*mach_sched_init) (void (*handler)(int, void *, struct pt_regs *));
@@ -21,9 +21,7 @@
 extern void (*mach_process_int) (int irq, struct pt_regs *fp);
 /* machine dependent timer functions */
 extern unsigned long (*mach_gettimeoffset)(void);
-extern void (*mach_gettod)(int *year, int *mon, int *day, int *hour,
-			   int *min, int *sec);
-extern int (*mach_hwclk)(int, struct hwclk_time*);
+extern int (*mach_hwclk)(int, struct rtc_time*);
 extern int (*mach_set_clock_mmss)(unsigned long);
 extern void (*mach_reset)( void );
 extern void (*mach_halt)( void );