patch-2.4.20 linux-2.4.20/arch/m68k/amiga/config.c
Next file: linux-2.4.20/arch/m68k/apollo/config.c
Previous file: linux-2.4.20/arch/ia64/vmlinux.lds.S
Back to the patch index
Back to the overall index
- Lines: 41
- Date:
Thu Nov 28 15:53:09 2002
- Orig file:
linux-2.4.19/arch/m68k/amiga/config.c
- Orig date:
Fri Aug 2 17:39:43 2002
diff -urN linux-2.4.19/arch/m68k/amiga/config.c linux-2.4.20/arch/m68k/amiga/config.c
@@ -20,6 +20,7 @@
#include <linux/console.h>
#include <linux/rtc.h>
#include <linux/init.h>
+#include <linux/vt_kern.h>
#ifdef CONFIG_ZORRO
#include <linux/zorro.h>
#endif
@@ -128,8 +129,6 @@
"\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"; /* 0x70 - 0x7f */
#endif
-extern void (*kd_mksound)(unsigned int, unsigned int);
-
/*
* Motherboard Resources present in all Amiga models
@@ -390,10 +389,12 @@
request_resource(&iomem_resource, &((struct resource *)&mb_resources)[i]);
mach_sched_init = amiga_sched_init;
+#ifdef CONFIG_VT
mach_keyb_init = amiga_keyb_init;
mach_kbdrate = amiga_kbdrate;
mach_kbd_translate = amiga_kbd_translate;
- SYSRQ_KEY = 0xff;
+ kd_mksound = amiga_mksound;
+#endif
mach_init_IRQ = amiga_init_IRQ;
mach_default_handler = &amiga_default_handler;
mach_request_irq = amiga_request_irq;
@@ -434,8 +435,8 @@
#ifdef CONFIG_DUMMY_CONSOLE
conswitchp = &dummy_con;
#endif
- kd_mksound = amiga_mksound;
#ifdef CONFIG_MAGIC_SYSRQ
+ SYSRQ_KEY = 0xff;
mach_sysrq_key = 0x5f; /* HELP */
mach_sysrq_shift_state = 0x03; /* SHIFT+ALTGR */
mach_sysrq_shift_mask = 0xff; /* all modifiers except CapsLock */
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)