diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-21 09:06:09 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-21 09:06:09 -0400 |
| commit | e66d90fb4abd0a27ee96f57a32fb561221c4d6ae (patch) | |
| tree | 3337cba94c7444b06fdb0e8b487287d07b71f4a0 /include/asm-m68k/irq.h | |
| parent | 55ca089e2579de90f048aca2a3030b8b2f864813 (diff) | |
| parent | 14b395e35d1afdd8019d11b92e28041fad591b71 (diff) | |
Merge branch 'linus' into xen-64bit
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 @@ | |||
| 24 | #elif defined(CONFIG_HP300) | 24 | #elif defined(CONFIG_HP300) |
| 25 | #define NR_IRQS 8 | 25 | #define NR_IRQS 8 |
| 26 | #else | 26 | #else |
| 27 | #error unknown nr of irqs | 27 | #define NR_IRQS 0 |
| 28 | #endif | 28 | #endif |
| 29 | 29 | ||
| 30 | /* | 30 | /* |