patch-2.4.20 linux-2.4.20/drivers/char/pc_keyb.c

Next file: linux-2.4.20/drivers/char/pcmcia/Config.in
Previous file: linux-2.4.20/drivers/char/nvram.c
Back to the patch index
Back to the overall index

diff -urN linux-2.4.19/drivers/char/pc_keyb.c linux-2.4.20/drivers/char/pc_keyb.c
@@ -69,6 +69,9 @@
 static int aux_reconnect = 0;
 #endif
 
+#ifndef kbd_controller_present
+#define kbd_controller_present()	1
+#endif
 static spinlock_t kbd_controller_lock = SPIN_LOCK_UNLOCKED;
 static unsigned char handle_kbd_event(void);
 
@@ -895,6 +898,11 @@
 
 void __init pckbd_init_hw(void)
 {
+	if (!kbd_controller_present()) {
+		kbd_exists = 0;
+		return;
+	}
+
 	kbd_request_region();
 
 	/* Flush any pending input. */

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)