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

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

diff -u --recursive --new-file v2.3.19/linux/include/asm-ppc/keyboard.h linux/include/asm-ppc/keyboard.h
@@ -16,11 +16,8 @@
 #ifdef __KERNEL__
 
 #include <linux/config.h>
-#include <asm/adb.h>
+#include <linux/adb.h>
 #include <asm/machdep.h>
-#ifdef CONFIG_APUS
-#include <asm-m68k/keyboard.h>
-#else
 
 #define KEYBOARD_IRQ			1
 #define DISABLE_KBD_DURING_INTERRUPTS	0
@@ -74,8 +71,6 @@
 #define kbd_sysrq_xlate	(ppc_md.ppc_kbd_sysrq_xlate)
 
 extern unsigned long SYSRQ_KEY;
-
-#endif /* CONFIG_APUS */
 
 #endif /* __KERNEL__ */
 

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