diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-10 13:30:08 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-10 13:30:08 -0400 |
| commit | 3dd392a407d15250a501fa109cc1f93fee95ef85 (patch) | |
| tree | c1faca3fa8bd0f7c8790b3e0887229b4a5a90e8b /include/asm-x86/mach-summit/mach_mpparse.h | |
| parent | b27a43c1e90582facad44de67d02bc9e9f900289 (diff) | |
| parent | d403a6484f0341bf0624d17ece46f24f741b6a92 (diff) | |
Merge branch 'linus' into x86/pat2
Conflicts:
arch/x86/mm/init_64.c
Diffstat (limited to 'include/asm-x86/mach-summit/mach_mpparse.h')
| -rw-r--r-- | include/asm-x86/mach-summit/mach_mpparse.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/asm-x86/mach-summit/mach_mpparse.h b/include/asm-x86/mach-summit/mach_mpparse.h index fdf591701339..92396f28772b 100644 --- a/include/asm-x86/mach-summit/mach_mpparse.h +++ b/include/asm-x86/mach-summit/mach_mpparse.h | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | #ifndef __ASM_MACH_MPPARSE_H | 1 | #ifndef ASM_X86__MACH_SUMMIT__MACH_MPPARSE_H |
| 2 | #define __ASM_MACH_MPPARSE_H | 2 | #define ASM_X86__MACH_SUMMIT__MACH_MPPARSE_H |
| 3 | 3 | ||
| 4 | #include <mach_apic.h> | 4 | #include <mach_apic.h> |
| 5 | #include <asm/tsc.h> | 5 | #include <asm/tsc.h> |
| @@ -107,4 +107,4 @@ static inline int is_WPEG(struct rio_detail *rio){ | |||
| 107 | rio->type == LookOutAWPEG || rio->type == LookOutBWPEG); | 107 | rio->type == LookOutAWPEG || rio->type == LookOutBWPEG); |
| 108 | } | 108 | } |
| 109 | 109 | ||
| 110 | #endif /* __ASM_MACH_MPPARSE_H */ | 110 | #endif /* ASM_X86__MACH_SUMMIT__MACH_MPPARSE_H */ |