patch-2.1.115 linux/include/asm-ppc/keyboard.h

Next file: linux/include/asm-ppc/linux_logo.h
Previous file: linux/include/asm-ppc/irq.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.114/linux/include/asm-ppc/keyboard.h linux/include/asm-ppc/keyboard.h
@@ -18,6 +18,10 @@
 #include <linux/config.h>
 #include <asm/adb.h>
 
+#ifdef CONFIG_APUS
+#include <asm-m68k/keyboard.h>
+#else
+
 #define KEYBOARD_IRQ			1
 #define DISABLE_KBD_DURING_INTERRUPTS	0
 #define INIT_KBD
@@ -167,6 +171,8 @@
 	else
 		mackbd_init_hw();
 }
+
+#endif /* CONFIG_APUS */
 
 #endif /* __KERNEL__ */
 

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov