Index: kernel/arch/ia64/include/bootinfo.h
===================================================================
--- kernel/arch/ia64/include/bootinfo.h	(revision 323a5aaf36674c20719d102e0508c32ef466bfa3)
+++ kernel/arch/ia64/include/bootinfo.h	(revision 23d9938f39720e050fe9811643a6134c2aeb44fd)
@@ -68,4 +68,5 @@
 	unsigned long freq_scale;
 	unsigned int wakeup_intno;
+	int hello_configured;
 
 } bootinfo_t;
Index: kernel/arch/ia64/include/drivers/kbd.h
===================================================================
--- kernel/arch/ia64/include/drivers/kbd.h	(revision 323a5aaf36674c20719d102e0508c32ef466bfa3)
+++ kernel/arch/ia64/include/drivers/kbd.h	(revision 23d9938f39720e050fe9811643a6134c2aeb44fd)
@@ -37,10 +37,9 @@
 
 
-typedef enum {
-	KBD_UNKNOWN,
-	KBD_SKI,
-	KBD_LEGACY,
-	KBD_NS16550
-} kbd_type_t;
+#define KBD_UNKNOWN 0
+#define	KBD_SKI 1
+#define	KBD_LEGACY 2
+#define	KBD_NS16550 3
+
 
 #endif
Index: kernel/arch/ia64/include/interrupt.h
===================================================================
--- kernel/arch/ia64/include/interrupt.h	(revision 323a5aaf36674c20719d102e0508c32ef466bfa3)
+++ kernel/arch/ia64/include/interrupt.h	(revision 23d9938f39720e050fe9811643a6134c2aeb44fd)
@@ -54,6 +54,6 @@
 #define VECTOR_TLB_SHOOTDOWN_IPI 0xf0
 #define INTERRUPT_TIMER		255
-#define IRQ_KBD			241
-#define IRQ_MOUSE		252
+#define IRQ_KBD			(0x01+LAGACY_INTERRUPT_BASE)
+#define IRQ_MOUSE		(0x0c+LAGACY_INTERRUPT_BASE)
 #define INTERRUPT_SPURIOUS	15
 #define LAGACY_INTERRUPT_BASE	0x20