diff options
author | Ralf Baechle <ralf@linux-mips.org> | 1999-02-15 02:15:32 +0000 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 1999-02-15 02:15:32 +0000 |
commit | 86464aed71025541805e7b1515541aee89879e33 (patch) | |
tree | e01a457a4912a8553bc65524aa3125d51f29f810 /include/asm-arm/irq.h | |
parent | 88f99939ecc6a95a79614574cb7d95ffccfc3466 (diff) |
Merge with Linux 2.2.1.
Diffstat (limited to 'include/asm-arm/irq.h')
-rw-r--r-- | include/asm-arm/irq.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-arm/irq.h b/include/asm-arm/irq.h index 59770101e..0e8c4ad27 100644 --- a/include/asm-arm/irq.h +++ b/include/asm-arm/irq.h @@ -3,7 +3,9 @@ #include <asm/arch/irqs.h> +#ifndef irq_cannonicalize #define irq_cannonicalize(i) (i) +#endif #ifndef NR_IRQS #define NR_IRQS 128 |