diff options
| author | Roman Zippel <zippel@linux-m68k.org> | 2006-06-25 05:46:59 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-25 10:00:57 -0700 |
| commit | 4facfde9f1d7b8a61fb0017460da45e23e60115c (patch) | |
| tree | 00da6c7110b4d19869f65ce0e2da085788112060 /arch | |
| parent | 92445eaaadc1f03f5a177ecc957bda76bf2ba8d5 (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 'arch')
| -rw-r--r-- | arch/m68k/kernel/ints.c | 4 | ||||
| -rw-r--r-- | arch/m68k/q40/q40ints.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/m68k/kernel/ints.c b/arch/m68k/kernel/ints.c index 895a56d69eba..3ce7c6166bb9 100644 --- a/arch/m68k/kernel/ints.c +++ b/arch/m68k/kernel/ints.c @@ -153,7 +153,7 @@ int cpu_request_irq(unsigned int irq, irqreturn_t (*handler)(int, void *, struct pt_regs *), unsigned long flags, const char *devname, void *dev_id) { - if (irq < IRQ1 || irq > IRQ7) { + if (irq < IRQ_AUTO_1 || irq > IRQ_AUTO_7) { printk("%s: Incorrect IRQ %d from %s\n", __FUNCTION__, irq, devname); return -ENXIO; @@ -183,7 +183,7 @@ int cpu_request_irq(unsigned int irq, void cpu_free_irq(unsigned int irq, void *dev_id) { - if (irq < IRQ1 || irq > IRQ7) { + if (irq < IRQ_AUTO_1 || irq > IRQ_AUTO_7) { printk("%s: Incorrect IRQ %d\n", __FUNCTION__, irq); return; } diff --git a/arch/m68k/q40/q40ints.c b/arch/m68k/q40/q40ints.c index f8ecc2664fe6..b106839ad813 100644 --- a/arch/m68k/q40/q40ints.c +++ b/arch/m68k/q40/q40ints.c @@ -93,8 +93,8 @@ void q40_init_IRQ (void) } /* setup handler for ISA ints */ - cpu_request_irq(IRQ2, q40_irq2_handler, 0, "q40 ISA and master chip", - NULL); + cpu_request_irq(IRQ_AUTO_2, q40_irq2_handler, 0, + "q40 ISA and master chip", NULL); /* now enable some ints.. */ master_outb(1,EXT_ENABLE_REG); /* ISA IRQ 5-15 */ |