diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-11 15:22:18 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-11 15:22:18 -0400 |
| commit | 6c82a000a29b93541b5b7db597a083c069755cc9 (patch) | |
| tree | b9e49724f56b47e4b3d0bd6c6fa3be88dac3a9e6 /include/asm-x86/irq_vectors.h | |
| parent | 5b4d2386c23e5de553fce002892c7691a989b350 (diff) | |
| parent | 39415a440ecceb0a5bd3c23686f18f83bb8368c6 (diff) | |
Merge branch 'x86/generalize-visws' into x86/core
Diffstat (limited to 'include/asm-x86/irq_vectors.h')
| -rw-r--r-- | include/asm-x86/irq_vectors.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-x86/irq_vectors.h b/include/asm-x86/irq_vectors.h index b58581e2e24e..0ac864ef3cd4 100644 --- a/include/asm-x86/irq_vectors.h +++ b/include/asm-x86/irq_vectors.h | |||
| @@ -107,9 +107,9 @@ | |||
| 107 | #define LAST_VM86_IRQ 15 | 107 | #define LAST_VM86_IRQ 15 |
| 108 | #define invalid_vm86_irq(irq) ((irq) < 3 || (irq) > 15) | 108 | #define invalid_vm86_irq(irq) ((irq) < 3 || (irq) > 15) |
| 109 | 109 | ||
| 110 | #if !defined(CONFIG_X86_VISWS) && !defined(CONFIG_X86_VOYAGER) | 110 | #if !defined(CONFIG_X86_VOYAGER) |
| 111 | 111 | ||
| 112 | # if defined(CONFIG_X86_IO_APIC) || defined(CONFIG_PARAVIRT) | 112 | # if defined(CONFIG_X86_IO_APIC) || defined(CONFIG_PARAVIRT) || defined(CONFIG_X86_VISWS) |
| 113 | 113 | ||
| 114 | # define NR_IRQS 224 | 114 | # define NR_IRQS 224 |
| 115 | 115 | ||