diff options
author | Geert Uytterhoeven <geert@linux-m68k.org> | 2011-08-18 14:47:16 +0200 |
---|---|---|
committer | Geert Uytterhoeven <geert@linux-m68k.org> | 2011-11-08 22:35:52 +0100 |
commit | a03010ed9b399fdbc28ac8836e0a6d4b15403f9f (patch) | |
tree | ea82d48efa6e8af9d8f759c77e004da29dd5c558 /arch/m68k/include | |
parent | dda7535912255015ecf7264c1d6691a09f8ba487 (diff) | |
download | blackbird-op-linux-a03010ed9b399fdbc28ac8836e0a6d4b15403f9f.tar.gz blackbird-op-linux-a03010ed9b399fdbc28ac8836e0a6d4b15403f9f.zip |
m68k/q40: Convert Q40/Q60 to genirq
q40_irq_handler() must be kept to translate ISA IRQs to the range 1-15.
q40_probe_irq_o{ff,n}() become unused.
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Richard Zidlicky <rz@linux-m68k.org>
Diffstat (limited to 'arch/m68k/include')
-rw-r--r-- | arch/m68k/include/asm/q40ints.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/m68k/include/asm/q40ints.h b/arch/m68k/include/asm/q40ints.h index 3d970afb708f..01cdbb4da465 100644 --- a/arch/m68k/include/asm/q40ints.h +++ b/arch/m68k/include/asm/q40ints.h @@ -25,5 +25,7 @@ #define Q40_IRQ14_MASK (1<<6) #define Q40_IRQ15_MASK (1<<7) +#ifndef CONFIG_GENERIC_HARDIRQS extern unsigned long q40_probe_irq_on (void); extern int q40_probe_irq_off (unsigned long irqs); +#endif |