diff options
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, | |||
| 153 | irqreturn_t (*handler)(int, void *, struct pt_regs *), | 153 | irqreturn_t (*handler)(int, void *, struct pt_regs *), |
| 154 | unsigned long flags, const char *devname, void *dev_id) | 154 | unsigned long flags, const char *devname, void *dev_id) |
| 155 | { | 155 | { |
| 156 | if (irq < IRQ1 || irq > IRQ7) { | 156 | if (irq < IRQ_AUTO_1 || irq > IRQ_AUTO_7) { |
| 157 | printk("%s: Incorrect IRQ %d from %s\n", | 157 | printk("%s: Incorrect IRQ %d from %s\n", |
| 158 | __FUNCTION__, irq, devname); | 158 | __FUNCTION__, irq, devname); |
| 159 | return -ENXIO; | 159 | return -ENXIO; |
| @@ -183,7 +183,7 @@ int cpu_request_irq(unsigned int irq, | |||
| 183 | 183 | ||
| 184 | void cpu_free_irq(unsigned int irq, void *dev_id) | 184 | void cpu_free_irq(unsigned int irq, void *dev_id) |
| 185 | { | 185 | { |
| 186 | if (irq < IRQ1 || irq > IRQ7) { | 186 | if (irq < IRQ_AUTO_1 || irq > IRQ_AUTO_7) { |
| 187 | printk("%s: Incorrect IRQ %d\n", __FUNCTION__, irq); | 187 | printk("%s: Incorrect IRQ %d\n", __FUNCTION__, irq); |
| 188 | return; | 188 | return; |
| 189 | } | 189 | } |
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) | |||
| 93 | } | 93 | } |
| 94 | 94 | ||
| 95 | /* setup handler for ISA ints */ | 95 | /* setup handler for ISA ints */ |
| 96 | cpu_request_irq(IRQ2, q40_irq2_handler, 0, "q40 ISA and master chip", | 96 | cpu_request_irq(IRQ_AUTO_2, q40_irq2_handler, 0, |
| 97 | NULL); | 97 | "q40 ISA and master chip", NULL); |
| 98 | 98 | ||
| 99 | /* now enable some ints.. */ | 99 | /* now enable some ints.. */ |
| 100 | master_outb(1,EXT_ENABLE_REG); /* ISA IRQ 5-15 */ | 100 | master_outb(1,EXT_ENABLE_REG); /* ISA IRQ 5-15 */ |
