summaryrefslogtreecommitdiffstats
path: root/arch/m68k/kernel
diff options
context:
space:
mode:
authorRoman Zippel <zippel@linux-m68k.org>2006-06-25 05:46:59 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-06-25 10:00:57 -0700
commit4facfde9f1d7b8a61fb0017460da45e23e60115c (patch)
tree00da6c7110b4d19869f65ce0e2da085788112060 /arch/m68k/kernel
parent92445eaaadc1f03f5a177ecc957bda76bf2ba8d5 (diff)
downloadblackbird-op-linux-4facfde9f1d7b8a61fb0017460da45e23e60115c.tar.gz
blackbird-op-linux-4facfde9f1d7b8a61fb0017460da45e23e60115c.zip
[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/kernel')
-rw-r--r--arch/m68k/kernel/ints.c4
1 files changed, 2 insertions, 2 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;
}
OpenPOWER on IntegriCloud