From 4facfde9f1d7b8a61fb0017460da45e23e60115c Mon Sep 17 00:00:00 2001 From: Roman Zippel Date: Sun, 25 Jun 2006 05:46:59 -0700 Subject: [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 Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- arch/m68k/kernel/ints.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'arch/m68k/kernel') diff --git a/arch/m68k/kernel/ints.c b/arch/m68k/kernel/ints.c index 895a56d69eb..3ce7c6166bb 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; } -- cgit v1.2.3