diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2005-07-14 00:23:51 +0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-07-14 00:23:51 +0400 |
commit | 327309e899662b482c58cf25f574513d38b5788c (patch) | |
tree | 069de438aa0e92dd9b6ba28e6b207e2cd07151a5 /include/asm-i386/apicdef.h | |
parent | 0c168775709faa74c1b87f1e61046e0c51ade7f3 (diff) | |
parent | c32511e2718618f0b53479eb36e07439aa363a74 (diff) | |
download | linux-327309e899662b482c58cf25f574513d38b5788c.tar.xz |
Merge upstream 2.6.13-rc3 into ieee80211 branch of netdev-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 |