diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-22 09:06:21 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-22 09:06:21 +0200 |
| commit | 76c3bb15d6786a0b8da0ad0090e0c9c3672fc08b (patch) | |
| tree | 3824e008db9d554229a70c85fbbc13238276bd7a /include/asm-m68k/irq.h | |
| parent | 7be42004065ce4df193aeef5befd26805267d0d9 (diff) | |
| parent | 93ded9b8fd42abe2c3607097963d8de6ad9117eb (diff) | |
| download | talos-op-linux-76c3bb15d6786a0b8da0ad0090e0c9c3672fc08b.tar.gz talos-op-linux-76c3bb15d6786a0b8da0ad0090e0c9c3672fc08b.zip | |
Merge branch 'linus' into x86/x2apic
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 /* |
