patch-2.4.19 linux-2.4.19/arch/m68k/mvme147/config.c

• Lines: 50
• Date: Fri Aug 2 17:39:43 2002
• Orig file: linux-2.4.18/arch/m68k/mvme147/config.c
• Orig date: Mon Jun 11 19:15:27 2001

diff -urN linux-2.4.18/arch/m68k/mvme147/config.c linux-2.4.19/arch/m68k/mvme147/config.c
@@ -48,7 +48,7 @@
 extern unsigned long mvme147_gettimeoffset (void);
 extern void mvme147_gettod (int *year, int *mon, int *day, int *hour,
                            int *min, int *sec);
-extern int mvme147_hwclk (int, struct hwclk_time *);
+extern int mvme147_hwclk (int, struct rtc_time *);
 extern int mvme147_set_clock_mmss (unsigned long);
 extern void mvme147_check_partition (struct gendisk *hd, unsigned int dev);
 extern void mvme147_reset (void);
@@ -184,7 +184,7 @@
 	return ((b>>4)*10 + (b&15));
 }
 
-int mvme147_hwclk(int op, struct hwclk_time *t)
+int mvme147_hwclk(int op, struct rtc_time *t)
 {
 	return 0;
 }
@@ -241,31 +241,7 @@
 	restore_flags(flags);
 }
 
-
-static int m147_scc_wait_key (struct console *co)
-{
-	volatile unsigned char *p = (volatile char *)M147_SCC_A_ADDR;
-	unsigned long	flags;
-	int		c;
-
-	/* wait for rx buf filled */
-	while ((*p & 0x01) == 0)
-		;
-
-	save_flags(flags);
-	cli();
-
-	*p = 8;
-	scc_delay();
-	c = *p;
-
-	restore_flags(flags);
-	return c;
-}
-
-
 void mvme147_init_console_port (struct console *co, int cflag)
 {
 	co->write    = m147_scc_write;
-	co->wait_key = m147_scc_wait_key;
 }