Commit e2907239 authored by Vojtech Pavlik's avatar Vojtech Pavlik

Merge

parents f17af196 edc01f56
...@@ -20,11 +20,14 @@ ...@@ -20,11 +20,14 @@
*/ */
#ifdef __alpha__ #ifdef __alpha__
#define I8042_KBD_IRQ 1 # define I8042_KBD_IRQ 1
#define I8042_AUX_IRQ (RTC_PORT(0) == 0x170 ? 9 : 12) /* Jensen is special */ # 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 #else
#define I8042_KBD_IRQ 1 # define I8042_KBD_IRQ 1
#define I8042_AUX_IRQ 12 # define I8042_AUX_IRQ 12
#endif #endif
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment