diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1998-05-07 02:55:41 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1998-05-07 02:55:41 +0000 |
| commit | dcec8a13bf565e47942a1751a9cec21bec5648fe (patch) | |
| tree | 548b69625b18cc2e88c3e68d0923be546c9ebb03 /include/asm-arm/arch-arc/irqs.h | |
| parent | 2e0f55e79c49509b7ff70ff1a10e1e9e90a3dfd4 (diff) | |
o Merge with Linux 2.1.99.
o Fix ancient bug in the ELF loader making ldd crash.
o Fix ancient bug in the keyboard code for SGI, SNI and Jazz.
Diffstat (limited to 'include/asm-arm/arch-arc/irqs.h')
| -rw-r--r-- | include/asm-arm/arch-arc/irqs.h | 29 |
1 files changed, 24 insertions, 5 deletions
diff --git a/include/asm-arm/arch-arc/irqs.h b/include/asm-arm/arch-arc/irqs.h index e4043aaef..48e90b1d7 100644 --- a/include/asm-arm/arch-arc/irqs.h +++ b/include/asm-arm/arch-arc/irqs.h @@ -1,12 +1,26 @@ /* * linux/include/asm-arm/arch-arc/irqs.h * - * Copyright (C) 1996 Russell King, Dave Gilbert (gilbertd@cs.man.ac.uk) + * Copyright (C) 1996 Russell King, Dave Gilbert + * + * Modifications: + * 04-04-1998 PJB Merged arc and a5k versions */ +#include <linux/config.h> + +#if defined(CONFIG_ARCH_A5K) +#define IRQ_PRINTER 0 +#define IRQ_BATLOW 1 +#define IRQ_FLOPPYINDEX 2 +#define IRQ_FLOPPYDISK 12 +#elif defined(CONFIG_ARCH_ARC) #define IRQ_PRINTERBUSY 0 -#define IRQ_SERIALRING 1 +#define IRQ_SERIALRING 1 #define IRQ_PRINTERACK 2 +#define IRQ_FLOPPYCHANGED 12 +#endif + #define IRQ_VSYNCPULSE 3 #define IRQ_POWERON 4 #define IRQ_TIMER0 5 @@ -16,15 +30,20 @@ #define IRQ_SOUNDCHANGE 9 #define IRQ_SERIALPORT 10 #define IRQ_HARDDISK 11 -#define IRQ_FLOPPYCHANGED 12 #define IRQ_EXPANSIONCARD 13 #define IRQ_KEYBOARDTX 14 #define IRQ_KEYBOARDRX 15 -#define FIQ_FLOPPYDATA 0 +#if defined(CONFIG_ARCH_A5K) +#define FIQ_SERIALPORT 4 +#elif defined(CONFIG_ARCH_ARC) #define FIQ_FLOPPYIRQ 1 +#define FIQ_FD1772 FIQ_FLOPPYIRQ +#endif + +#define FIQ_FLOPPYDATA 0 #define FIQ_ECONET 2 #define FIQ_EXPANSIONCARD 6 #define FIQ_FORCE 7 -#define FIQ_FD1772 FIQ_FLOPPYIRQ +#define IRQ_TIMER IRQ_TIMER0 |