diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2009-03-23 09:50:03 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2009-03-23 16:20:20 -0400 |
| commit | 80c5520811d3805adcb15c570ea5e2d489fa5d0b (patch) | |
| tree | ae797a7f4af39f80e77526533d06ac23b439f0ab /arch/x86/include/asm/mach-default/mach_mpspec.h | |
| parent | b3e3b302cf6dc8d60b67f0e84d1fa5648889c038 (diff) | |
| parent | 8c083f081d0014057901c68a0a3e0f8ca7ac8d23 (diff) | |
Merge branch 'cpus4096' into irq/threaded
Conflicts:
arch/parisc/kernel/irq.c
kernel/irq/handle.c
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/include/asm/mach-default/mach_mpspec.h')
| -rw-r--r-- | arch/x86/include/asm/mach-default/mach_mpspec.h | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/arch/x86/include/asm/mach-default/mach_mpspec.h b/arch/x86/include/asm/mach-default/mach_mpspec.h deleted file mode 100644 index e85ede686be..00000000000 --- a/arch/x86/include/asm/mach-default/mach_mpspec.h +++ /dev/null | |||
| @@ -1,12 +0,0 @@ | |||
| 1 | #ifndef _ASM_X86_MACH_DEFAULT_MACH_MPSPEC_H | ||
| 2 | #define _ASM_X86_MACH_DEFAULT_MACH_MPSPEC_H | ||
| 3 | |||
| 4 | #define MAX_IRQ_SOURCES 256 | ||
| 5 | |||
| 6 | #if CONFIG_BASE_SMALL == 0 | ||
| 7 | #define MAX_MP_BUSSES 256 | ||
| 8 | #else | ||
| 9 | #define MAX_MP_BUSSES 32 | ||
| 10 | #endif | ||
| 11 | |||
| 12 | #endif /* _ASM_X86_MACH_DEFAULT_MACH_MPSPEC_H */ | ||