diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-07-21 13:02:45 +0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-07-21 13:02:45 +0400 |
commit | e27772b48df91a954a74b1411b57d83b945a58c7 (patch) | |
tree | ebd4a434d9e3cbd0844109e4469f91daac581b59 /include/asm-m68k/irq.h | |
parent | d092633bff3b19faffc480fe9810805e7792a029 (diff) | |
parent | 14b395e35d1afdd8019d11b92e28041fad591b71 (diff) | |
download | linux-e27772b48df91a954a74b1411b57d83b945a58c7.tar.xz |
Merge branch 'linus' into x86/urgent
Diffstat (limited to 'include/asm-m68k/irq.h')
-rw-r--r-- | include/asm-m68k/irq.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-m68k/irq.h b/include/asm-m68k/irq.h index eb29a5260591..226bfc0f21b1 100644 --- a/include/asm-m68k/irq.h +++ b/include/asm-m68k/irq.h @@ -24,7 +24,7 @@ #elif defined(CONFIG_HP300) #define NR_IRQS 8 #else -#error unknown nr of irqs +#define NR_IRQS 0 #endif /* |