--- zzzz-none-000/linux-2.4.17/include/asm-ppc/keyboard.h	2001-08-30 03:49:36.000000000 +0000
+++ sangam-fb-322/linux-2.4.17/include/asm-ppc/keyboard.h	2004-11-24 13:21:50.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * BK Id: SCCS/s.keyboard.h 1.11 08/29/01 10:07:29 paulus
+ * BK Id: SCCS/s.keyboard.h 1.18 11/28/01 13:29:57 paulus
  */
 /*
  *  linux/include/asm-ppc/keyboard.h
@@ -13,8 +13,8 @@
  * like the intel pc for prep systems, different for power macs.
  */
 
-#ifndef __ASMPPC_KEYBOARD_H
-#define __ASMPPC_KEYBOARD_H
+#ifndef __ASM_KEYBOARD_H__
+#define __ASM_KEYBOARD_H__
 
 #ifdef __KERNEL__
 
@@ -25,8 +25,14 @@
 #include <linux/ioport.h>
 #include <linux/kd.h>
 #include <asm/io.h>
+/* IBM Spruce platform is different. */
+#ifdef CONFIG_SPRUCE
+#include <platforms/spruce.h>
+#endif
 
+#ifndef KEYBOARD_IRQ
 #define KEYBOARD_IRQ			1
+#endif
 #define DISABLE_KBD_DURING_INTERRUPTS	0
 #define INIT_KBD
 
@@ -85,10 +91,12 @@
                                              "keyboard", NULL)
 
 /* How to access the keyboard macros on this platform.  */
+#ifndef kbd_read_input
 #define kbd_read_input() inb(KBD_DATA_REG)
 #define kbd_read_status() inb(KBD_STATUS_REG)
 #define kbd_write_output(val) outb(val, KBD_DATA_REG)
 #define kbd_write_command(val) outb(val, KBD_CNTL_REG)
+#endif
 
 /* Some stoneage hardware needs delays after some operations.  */
 #define kbd_pause() do { } while(0)
@@ -97,7 +105,9 @@
  * Machine specific bits for the PS/2 driver
  */
 
+#ifndef AUX_IRQ	
 #define AUX_IRQ 12
+#endif
 
 #define aux_request_irq(hand, dev_id)					\
 	request_irq(AUX_IRQ, hand, SA_SHIRQ, "PS/2 Mouse", dev_id)
@@ -105,5 +115,4 @@
 #define aux_free_irq(dev_id) free_irq(AUX_IRQ, dev_id)
 
 #endif /* __KERNEL__ */
-
-#endif /* __ASMPPC_KEYBOARD_H */
+#endif /* __ASM_KEYBOARD_H__ */