summaryrefslogtreecommitdiff
path: root/arch/m68k/q40
diff options
context:
space:
mode:
authorRoman Zippel <zippel@linux-m68k.org>2006-06-25 16:46:59 +0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-06-25 21:00:57 +0400
commit4facfde9f1d7b8a61fb0017460da45e23e60115c (patch)
tree00da6c7110b4d19869f65ce0e2da085788112060 /arch/m68k/q40
parent92445eaaadc1f03f5a177ecc957bda76bf2ba8d5 (diff)
downloadlinux-4facfde9f1d7b8a61fb0017460da45e23e60115c.tar.xz
[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/m68k/q40')
-rw-r--r--arch/m68k/q40/q40ints.c4
1 files changed, 2 insertions, 2 deletions
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 */