patch-2.4.20 linux-2.4.20/arch/m68k/apollo/config.c
Next file: linux-2.4.20/arch/m68k/apollo/dn_ints.c
Previous file: linux-2.4.20/arch/m68k/amiga/config.c
Back to the patch index
Back to the overall index
- Lines: 36
- Date:
Thu Nov 28 15:53:09 2002
- Orig file:
linux-2.4.19/arch/m68k/apollo/config.c
- Orig date:
Fri Aug 2 17:39:43 2002
diff -urN linux-2.4.19/arch/m68k/apollo/config.c linux-2.4.20/arch/m68k/apollo/config.c
@@ -5,6 +5,7 @@
#include <linux/tty.h>
#include <linux/console.h>
#include <linux/rtc.h>
+#include <linux/vt_kern.h>
#include <asm/setup.h>
#include <asm/bootinfo.h>
@@ -42,7 +43,6 @@
extern void dn_dummy_waitbut(void);
extern struct fb_info *dn_fb_init(long *);
extern void dn_dummy_debug_init(void);
-extern void (*kd_mksound)(unsigned int, unsigned int);
extern void dn_dummy_video_setup(char *,int *);
extern void dn_process_int(int irq, struct pt_regs *fp);
#ifdef CONFIG_HEARTBEAT
@@ -166,8 +166,11 @@
dn_setup_model();
mach_sched_init=dn_sched_init; /* */
+#ifdef CONFIG_VT
mach_keyb_init=dn_keyb_init;
mach_kbdrate=dn_dummy_kbdrate;
+ kd_mksound = dn_mksound;
+#endif
mach_init_IRQ=dn_init_IRQ;
mach_default_handler=NULL;
mach_request_irq = dn_request_irq;
@@ -189,7 +192,6 @@
#ifdef CONFIG_DUMMY_CONSOLE
conswitchp = &dummy_con;
#endif
- kd_mksound = dn_mksound;
#ifdef CONFIG_HEARTBEAT
mach_heartbeat = dn_heartbeat;
#endif
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)