diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-06 12:00:33 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-06 12:00:33 -0500 |
| commit | 3d14b5beba35250c548d3851a2b84fce742d8311 (patch) | |
| tree | 065e3d93c3fcbc5ee4c44fa78662393cddbdf6de /arch/x86/include/asm/apicnum.h | |
| parent | 0719dc341389882cc834ed18fc9b7fc6006b2b85 (diff) | |
| parent | 1bf8e6219552d5dd27012d567ec8c4bb9c2d86b4 (diff) | |
Merge branch 'sa1100' into devel
Diffstat (limited to 'arch/x86/include/asm/apicnum.h')
| -rw-r--r-- | arch/x86/include/asm/apicnum.h | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/arch/x86/include/asm/apicnum.h b/arch/x86/include/asm/apicnum.h deleted file mode 100644 index 82f613c607ce..000000000000 --- a/arch/x86/include/asm/apicnum.h +++ /dev/null | |||
| @@ -1,12 +0,0 @@ | |||
| 1 | #ifndef _ASM_X86_APICNUM_H | ||
| 2 | #define _ASM_X86_APICNUM_H | ||
| 3 | |||
| 4 | /* define MAX_IO_APICS */ | ||
| 5 | #ifdef CONFIG_X86_32 | ||
| 6 | # define MAX_IO_APICS 64 | ||
| 7 | #else | ||
| 8 | # define MAX_IO_APICS 128 | ||
| 9 | # define MAX_LOCAL_APIC 32768 | ||
| 10 | #endif | ||
| 11 | |||
| 12 | #endif /* _ASM_X86_APICNUM_H */ | ||