patch-2.4.22 linux-2.4.22/arch/m68k/mac/config.c
Next file: linux-2.4.22/arch/m68k/mm/memory.c
Previous file: linux-2.4.22/arch/m68k/kernel/m68k_ksyms.c
Back to the patch index
Back to the overall index
- Lines: 33
- Date:
2003-08-25 04:44:39.000000000 -0700
- Orig file:
linux-2.4.21/arch/m68k/mac/config.c
- Orig date:
2003-06-13 07:51:31.000000000 -0700
diff -urN linux-2.4.21/arch/m68k/mac/config.c linux-2.4.22/arch/m68k/mac/config.c
@@ -91,7 +91,7 @@
extern void mackbd_leds(unsigned int leds);
extern int mackbd_translate(unsigned char keycode, unsigned char *keycodep, char raw_mode);
-extern void mac_hid_init_hw(void);
+extern void __init mac_hid_init_hw(void);
extern int mac_hid_kbd_translate(unsigned char scancode, unsigned char *keycode, char raw_mode);
#ifdef CONFIG_MAGIC_SYSRQ
@@ -202,6 +202,14 @@
restore_flags(cpu_flags);
}
+#if defined(CONFIG_VT) && defined(CONFIG_INPUT_ADBHID)
+static int __init mac_keyb_init(void)
+{
+ mac_hid_init_hw();
+ return 0;
+}
+#endif
+
void __init config_mac(void)
{
if (!MACH_IS_MAC) {
@@ -210,7 +218,7 @@
#ifdef CONFIG_VT
#ifdef CONFIG_INPUT_ADBHID
- mach_keyb_init = mac_hid_init_hw;
+ mach_keyb_init = mac_keyb_init;
mach_kbd_translate = mac_hid_kbd_translate;
#ifdef CONFIG_MAGIC_SYSRQ
#ifdef CONFIG_MAC_ADBKEYCODES
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)