Merge

e2907239 · Vojtech Pavlik · f17af196 · edc01f56 · e2907239
Commit e2907239 authored Jun 13, 2003 by Vojtech Pavlik
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 4 deletions

drivers/input/serio/i8042-io.h drivers/input/serio/i8042-io.h +7 -4

No files found.
--- a/drivers/input/serio/i8042-io.h
+++ b/drivers/input/serio/i8042-io.h
@@ -20,11 +20,14 @@
 */

 #ifdef __alpha__
-#define I8042_KBD_IRQ	1
-#define I8042_AUX_IRQ	(RTC_PORT(0) == 0x170 ? 9 : 12)	/* Jensen is special */
+# define I8042_KBD_IRQ	1
+# define I8042_AUX_IRQ	(RTC_PORT(0) == 0x170 ? 9 : 12)	/* Jensen is special */
+#elif defined(__ia64__)
+# define I8042_KBD_IRQ isa_irq_to_vector(1)
+# define I8042_AUX_IRQ isa_irq_to_vector(12)
 #else
-#define I8042_KBD_IRQ	1
-#define I8042_AUX_IRQ	12
+# define I8042_KBD_IRQ	1
+# define I8042_AUX_IRQ	12
 #endif

 /*