aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-um/irq.h
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2008-05-18 05:54:43 -0400
committerThomas Gleixner <tglx@linutronix.de>2008-05-18 05:54:43 -0400
commitb4ef290d7c3abd1bf8cefcf8def359537fda7f31 (patch)
treef3e270923fa36c773eee3bb1f9981aab1711d938 /include/asm-um/irq.h
parent77b52b4c5c66175553ee59eb43f74366f1e54bde (diff)
parentf26a3988917913b3d11b2bd741601a2c64ab9204 (diff)
Merge branch 'linus' into x86/pat
Diffstat (limited to 'include/asm-um/irq.h')
-rw-r--r--include/asm-um/irq.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/asm-um/irq.h b/include/asm-um/irq.h
index de389a477cdd..4a2037f8204b 100644
--- a/include/asm-um/irq.h
+++ b/include/asm-um/irq.h
@@ -15,8 +15,9 @@
15#define SIGIO_WRITE_IRQ 11 15#define SIGIO_WRITE_IRQ 11
16#define TELNETD_IRQ 12 16#define TELNETD_IRQ 12
17#define XTERM_IRQ 13 17#define XTERM_IRQ 13
18#define RANDOM_IRQ 14
18 19
19#define LAST_IRQ XTERM_IRQ 20#define LAST_IRQ RANDOM_IRQ
20#define NR_IRQS (LAST_IRQ + 1) 21#define NR_IRQS (LAST_IRQ + 1)
21 22
22#endif 23#endif