diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-01-29 01:41:54 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-01-29 01:41:54 +0000 |
| commit | f969d69ba9f952e5bdd38278e25e26a3e4a61a70 (patch) | |
| tree | b3530d803df59d726afaabebc6626987dee1ca05 /arch/ppc/kernel/chrp_setup.c | |
| parent | a10ce7ef2066b455d69187643ddf2073bfc4db24 (diff) | |
Merge with 2.3.27.
Diffstat (limited to 'arch/ppc/kernel/chrp_setup.c')
| -rw-r--r-- | arch/ppc/kernel/chrp_setup.c | 26 |
1 files changed, 8 insertions, 18 deletions
diff --git a/arch/ppc/kernel/chrp_setup.c b/arch/ppc/kernel/chrp_setup.c index e70ba4dca..938cea36d 100644 --- a/arch/ppc/kernel/chrp_setup.c +++ b/arch/ppc/kernel/chrp_setup.c @@ -11,7 +11,6 @@ */ #include <linux/config.h> -#include <linux/module.h> #include <linux/errno.h> #include <linux/sched.h> #include <linux/kernel.h> @@ -576,9 +575,10 @@ void __init ppc_md.calibrate_decr = chrp_calibrate_decr; #ifdef CONFIG_VT -#ifdef CONFIG_MAC_KEYBOAD +#ifdef CONFIG_MAC_KEYBOARD if (adb_driver == NULL) { +#endif /* CONFIG_MAC_KEYBOAD */ ppc_md.kbd_setkeycode = pckbd_setkeycode; ppc_md.kbd_getkeycode = pckbd_getkeycode; ppc_md.kbd_translate = pckbd_translate; @@ -588,7 +588,8 @@ void __init #ifdef CONFIG_MAGIC_SYSRQ ppc_md.ppc_kbd_sysrq_xlate = pckbd_sysrq_xlate; SYSRQ_KEY = 0x54; -#endif +#endif /* CONFIG_MAGIC_SYSRQ */ +#ifdef CONFIG_MAC_KEYBOARD } else { @@ -601,24 +602,13 @@ void __init #ifdef CONFIG_MAGIC_SYSRQ ppc_md.ppc_kbd_sysrq_xlate = mackbd_sysrq_xlate; SYSRQ_KEY = 0x69; -#endif +#endif /* CONFIG_MAGIC_SYSRQ */ } -#else - ppc_md.kbd_setkeycode = pckbd_setkeycode; - ppc_md.kbd_getkeycode = pckbd_getkeycode; - ppc_md.kbd_translate = pckbd_translate; - ppc_md.kbd_unexpected_up = pckbd_unexpected_up; - ppc_md.kbd_leds = pckbd_leds; - ppc_md.kbd_init_hw = pckbd_init_hw; -#ifdef CONFIG_MAGIC_SYSRQ - ppc_md.ppc_kbd_sysrq_xlate = pckbd_sysrq_xlate; - SYSRQ_KEY = 0x54; -#endif +#endif /* CONFIG_MAC_KEYBOARD */ +#endif /* CONFIG_VT */ if ( rtas_data ) ppc_md.progress = chrp_progress; -#endif -#endif - + #if defined(CONFIG_BLK_DEV_IDE) || defined(CONFIG_BLK_DEV_IDE_MODULE) ppc_ide_md.insw = chrp_ide_insw; ppc_ide_md.outsw = chrp_ide_outsw; |