patch-2.1.113 linux/arch/m68k/atari/atakeyb.c

Next file: linux/arch/m68k/atari/config.c
Previous file: linux/arch/m68k/amiga/pcmcia.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.112/linux/arch/m68k/atari/atakeyb.c linux/arch/m68k/atari/atakeyb.c
@@ -31,7 +31,6 @@
 #include <asm/atari_joystick.h>
 #include <asm/irq.h>
 
-extern unsigned char mach_keyboard_type;
 static void atakeyb_rep( unsigned long ignore );
 extern unsigned int keymap_count;
 
@@ -781,7 +780,7 @@
     keymap_count = 8;
 
     /* say that we don't have an AltGr key */
-    mach_keyboard_type = KB_84;
+    keyboard_type = KB_84;
 
     kb_state.state = KEYBOARD;
     kb_state.len = 0;
@@ -864,6 +863,6 @@
 }
 
 /* for "kbd-reset" cmdline param */
-__initfunc(void kbd_reset_setup(char *str, int *ints))
+__initfunc(void atari_kbd_reset_setup(char *str, int *ints))
 {
 }

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov