[Linux-mips-commits]CVS: linux/arch/mips64/sgi-ip22 ip22-setup.c,1.5,1.6

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

Update of /cvsroot/linux-mips/linux/arch/mips64/sgi-ip22
In directory usw-pr-cvs1:/tmp/cvs-serv13849/arch/mips64/sgi-ip22

Modified Files:
	ip22-setup.c 
Log Message:
Synced to 2.4.10.

Index: ip22-setup.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips64/sgi-ip22/ip22-setup.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- ip22-setup.c	2001/09/09 20:17:15	1.5
+++ ip22-setup.c	2001/10/19 21:19:38	1.6
@@ -36,10 +36,6 @@
 extern void ip22_reboot_setup(void);
 extern void ip22_volume_set(unsigned char);
 
-#if defined(CONFIG_SERIAL_CONSOLE) || defined(CONFIG_ARC_CONSOLE)
-extern void console_setup(char *);
-#endif
-
 #define sgi_kh ((struct hpc_keyb *) (KSEG1 + 0x1fbd9800 + 64))
 
 #define KBD_STAT_IBF		0x02	/* Keyboard input buffer full */
@@ -103,16 +99,16 @@
 }
 
 struct kbd_ops sgi_kbd_ops = {
-	ip22_request_region,
-	ip22_request_irq,
+	kbd_request_region:	ip22_request_region,
+	kbd_request_irq:	ip22_request_irq,
 
-	ip22_aux_request_irq,
-	ip22_aux_free_irq,
+	aux_request_irq:	ip22_aux_request_irq,
+	aux_free_irq:		ip22_aux_free_irq,
 
-	ip22_read_input,
-	ip22_write_output,
-	ip22_write_command,
-	ip22_read_status
+	kbd_read_input:		ip22_read_input,
+	kbd_write_output:	ip22_write_output,
+	kbd_write_command:	ip22_write_command,
+	kbd_read_status:	ip22_read_status
 };
 
 int __init page_is_ram(unsigned long pagenr)