diff options
| author | Len Brown <len.brown@intel.com> | 2005-07-12 17:21:56 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-07-12 17:21:56 -0400 |
| commit | 5028770a42e7bc4d15791a44c28f0ad539323807 (patch) | |
| tree | 74800e35129775413c13ce7caf036ca19e3ce56c /include/asm-i386/apicdef.h | |
| parent | 9f02d6b7b43d46a74dd385f06090104ecd0fb807 (diff) | |
| parent | d8683a0cb5d09cb7f19feefa708424a84577e68f (diff) | |
[ACPI] merge acpi-2.6.12 branch into latest Linux 2.6.13-rc...
Signed-off-by: Len Brown <len.brown@intel.com>
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 @@ | |||
| 109 | 109 | ||
| 110 | #define APIC_BASE (fix_to_virt(FIX_APIC_BASE)) | 110 | #define APIC_BASE (fix_to_virt(FIX_APIC_BASE)) |
| 111 | 111 | ||
| 112 | #ifdef CONFIG_NUMA | 112 | #define MAX_IO_APICS 64 |
| 113 | #define MAX_IO_APICS 32 | ||
| 114 | #else | ||
| 115 | #define MAX_IO_APICS 8 | ||
| 116 | #endif | ||
| 117 | 113 | ||
| 118 | /* | 114 | /* |
| 119 | * the local APIC register structure, memory mapped. Not terribly well | 115 | * the local APIC register structure, memory mapped. Not terribly well |