diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-20 19:02:06 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-20 19:02:06 -0400 |
| commit | ebc79c4f8da0f92efa968e0328f32334a2ce80cf (patch) | |
| tree | 8a3ff82f4b7ae26df4f7c8b4c852748f7533a418 /arch/x86/kernel/cpu | |
| parent | dcbb5593d980bbf4ceef320f8c75210398ed84db (diff) | |
| parent | 5ac7687860dbfd3dd90e09d2c10dd31de91f20c2 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jaswinder/linux-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/jaswinder/linux-2.6:
includecheck fix: x86, cpu/common.c
includecheck fix: kernel/trace, ring_buffer.c
includecheck fix: include/linux, ftrace.h
includecheck fix: include/linux, page_cgroup.h
includecheck fix: include/linux, aio.h
includecheck fix: include/drm, drm_memory.h
includecheck fix: include/acpi, acpi_bus.h
includecheck fix: drivers/xen, evtchn.c
includecheck fix: drivers/video, vgacon.c
includecheck fix: drivers/scsi, ibmvscsi.c
includecheck fix: drivers/scsi, libfcoe.c
includecheck fix: x86, shadow.c
includecheck fix: x86, traps.c
includecheck fix: um, helper.c
includecheck fix: s390, sys_s390.c
Diffstat (limited to 'arch/x86/kernel/cpu')
| -rw-r--r-- | arch/x86/kernel/cpu/common.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c index 2055fc2b2e6b..2fea97eccf77 100644 --- a/arch/x86/kernel/cpu/common.c +++ b/arch/x86/kernel/cpu/common.c | |||
| @@ -34,7 +34,6 @@ | |||
| 34 | #include <asm/mce.h> | 34 | #include <asm/mce.h> |
| 35 | #include <asm/msr.h> | 35 | #include <asm/msr.h> |
| 36 | #include <asm/pat.h> | 36 | #include <asm/pat.h> |
| 37 | #include <linux/smp.h> | ||
| 38 | 37 | ||
| 39 | #ifdef CONFIG_X86_LOCAL_APIC | 38 | #ifdef CONFIG_X86_LOCAL_APIC |
| 40 | #include <asm/uv/uv.h> | 39 | #include <asm/uv/uv.h> |