diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-26 10:29:23 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-26 10:29:23 -0400 |
| commit | 6dec3a10a7a6093af10cef7ac56021150afd6451 (patch) | |
| tree | f4d8511f023e3e0c203baf889d4a0f3925882381 /arch/x86/mach-generic/numaq.c | |
| parent | 29308333fbe2cc61258c1c470f9403960428beb2 (diff) | |
| parent | 10a010f6953b5a14ba2f0be40a4fce1bea220875 (diff) | |
Merge branch 'x86/x2apic' into x86/core
Conflicts:
include/asm-x86/i8259.h
include/asm-x86/msidef.h
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/mach-generic/numaq.c')
| -rw-r--r-- | arch/x86/mach-generic/numaq.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/mach-generic/numaq.c b/arch/x86/mach-generic/numaq.c index 8091e68764c4..95c07efff6b7 100644 --- a/arch/x86/mach-generic/numaq.c +++ b/arch/x86/mach-generic/numaq.c | |||
| @@ -4,7 +4,6 @@ | |||
| 4 | #define APIC_DEFINITION 1 | 4 | #define APIC_DEFINITION 1 |
| 5 | #include <linux/threads.h> | 5 | #include <linux/threads.h> |
| 6 | #include <linux/cpumask.h> | 6 | #include <linux/cpumask.h> |
| 7 | #include <linux/smp.h> | ||
| 8 | #include <asm/mpspec.h> | 7 | #include <asm/mpspec.h> |
| 9 | #include <asm/genapic.h> | 8 | #include <asm/genapic.h> |
| 10 | #include <asm/fixmap.h> | 9 | #include <asm/fixmap.h> |
| @@ -12,8 +11,9 @@ | |||
| 12 | #include <linux/kernel.h> | 11 | #include <linux/kernel.h> |
| 13 | #include <linux/string.h> | 12 | #include <linux/string.h> |
| 14 | #include <linux/init.h> | 13 | #include <linux/init.h> |
| 15 | #include <asm/mach-numaq/mach_apic.h> | ||
| 16 | #include <asm/mach-numaq/mach_apicdef.h> | 14 | #include <asm/mach-numaq/mach_apicdef.h> |
| 15 | #include <linux/smp.h> | ||
| 16 | #include <asm/mach-numaq/mach_apic.h> | ||
| 17 | #include <asm/mach-numaq/mach_ipi.h> | 17 | #include <asm/mach-numaq/mach_ipi.h> |
| 18 | #include <asm/mach-numaq/mach_mpparse.h> | 18 | #include <asm/mach-numaq/mach_mpparse.h> |
| 19 | #include <asm/mach-numaq/mach_wakecpu.h> | 19 | #include <asm/mach-numaq/mach_wakecpu.h> |