diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-13 01:04:50 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-13 01:04:50 +0200 |
| commit | 3f603ed319d5120e883e64ac5967b2fc848fc43b (patch) | |
| tree | 52ef311c245e4e4cd623b546ea1daf05a5ea8911 /include/asm-i386/apicdef.h | |
| parent | [PATCH] v4l: broken hybrid dvb inclusion (diff) | |
| parent | [ACPI] merge acpi-2.6.12 branch into latest Linux 2.6.13-rc... (diff) | |
| download | linux-3f603ed319d5120e883e64ac5967b2fc848fc43b.tar.xz linux-3f603ed319d5120e883e64ac5967b2fc848fc43b.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/lenb/linux-2.6
Diffstat (limited to 'include/asm-i386/apicdef.h')
| -rw-r--r-- | include/asm-i386/apicdef.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/include/asm-i386/apicdef.h b/include/asm-i386/apicdef.h index 0fed5e3c699c..a96a8f48fbfc 100644 --- a/include/asm-i386/apicdef.h +++ b/include/asm-i386/apicdef.h @@ -109,11 +109,7 @@ #define APIC_BASE (fix_to_virt(FIX_APIC_BASE)) -#ifdef CONFIG_NUMA - #define MAX_IO_APICS 32 -#else - #define MAX_IO_APICS 8 -#endif +#define MAX_IO_APICS 64 /* * the local APIC register structure, memory mapped. Not terribly well |