aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-m68k/irq.h
diff options
context:
space:
mode:
authorRoman Zippel <zippel@linux-m68k.org>2006-06-25 08:46:59 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-06-25 13:00:57 -0400
commit4facfde9f1d7b8a61fb0017460da45e23e60115c (patch)
tree00da6c7110b4d19869f65ce0e2da085788112060 /include/asm-m68k/irq.h
parent92445eaaadc1f03f5a177ecc957bda76bf2ba8d5 (diff)
[PATCH] m68k: cleanup generic irq names
Rename IRQ1..IRQ7 to IRQ_AUTO_1..IRQ_AUTO_7 and remove the duplicate defintions. Signed-off-by: Roman Zippel <zippel@linux-m68k.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/asm-m68k/irq.h')
-rw-r--r--include/asm-m68k/irq.h22
1 files changed, 10 insertions, 12 deletions
diff --git a/include/asm-m68k/irq.h b/include/asm-m68k/irq.h
index 9727ca9d9f26..320a084bbd11 100644
--- a/include/asm-m68k/irq.h
+++ b/include/asm-m68k/irq.h
@@ -4,7 +4,7 @@
4#include <linux/interrupt.h> 4#include <linux/interrupt.h>
5 5
6/* 6/*
7 * # of m68k interrupts 7 * # of m68k auto vector interrupts
8 */ 8 */
9 9
10#define SYS_IRQS 8 10#define SYS_IRQS 8
@@ -40,19 +40,17 @@
40 * that routine requires service. 40 * that routine requires service.
41 */ 41 */
42 42
43#define IRQ1 (1) /* level 1 interrupt */ 43#define IRQ_SPURIOUS 0
44#define IRQ2 (2) /* level 2 interrupt */
45#define IRQ3 (3) /* level 3 interrupt */
46#define IRQ4 (4) /* level 4 interrupt */
47#define IRQ5 (5) /* level 5 interrupt */
48#define IRQ6 (6) /* level 6 interrupt */
49#define IRQ7 (7) /* level 7 interrupt (non-maskable) */
50 44
51/* 45#define IRQ_AUTO_1 1 /* level 1 interrupt */
52 * "Generic" interrupt sources 46#define IRQ_AUTO_2 2 /* level 2 interrupt */
53 */ 47#define IRQ_AUTO_3 3 /* level 3 interrupt */
48#define IRQ_AUTO_4 4 /* level 4 interrupt */
49#define IRQ_AUTO_5 5 /* level 5 interrupt */
50#define IRQ_AUTO_6 6 /* level 6 interrupt */
51#define IRQ_AUTO_7 7 /* level 7 interrupt (non-maskable) */
54 52
55#define IRQ_SCHED_TIMER (8) /* interrupt source for scheduling timer */ 53#define IRQ_USER 8
56 54
57static __inline__ int irq_canonicalize(int irq) 55static __inline__ int irq_canonicalize(int irq)
58{ 56{