diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-09-23 07:26:27 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-09-23 07:26:27 -0400 |
| commit | 101d5b713700b902b1c200cdd1925c3cb7d34567 (patch) | |
| tree | a0d4b4140129ad2f24fd17b965dfcfbbb1ac01db /include/asm-x86/mtrr.h | |
| parent | cec5eb7be3a104fffd27ca967ee8e15a123050e2 (diff) | |
| parent | e6babb6b7fed93c93f8fc5ef8ebd3a474fc2df3e (diff) | |
Merge branch 'x86/signal' into core/signal
Conflicts:
arch/x86/kernel/cpu/feature_names.c
arch/x86/kernel/setup.c
drivers/pci/intel-iommu.c
include/asm-x86/cpufeature.h
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/asm-x86/mtrr.h')
| -rw-r--r-- | include/asm-x86/mtrr.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/asm-x86/mtrr.h b/include/asm-x86/mtrr.h index a69a01a51729..23a7f83da953 100644 --- a/include/asm-x86/mtrr.h +++ b/include/asm-x86/mtrr.h | |||
| @@ -20,8 +20,8 @@ | |||
| 20 | The postal address is: | 20 | The postal address is: |
| 21 | Richard Gooch, c/o ATNF, P. O. Box 76, Epping, N.S.W., 2121, Australia. | 21 | Richard Gooch, c/o ATNF, P. O. Box 76, Epping, N.S.W., 2121, Australia. |
| 22 | */ | 22 | */ |
| 23 | #ifndef _ASM_X86_MTRR_H | 23 | #ifndef ASM_X86__MTRR_H |
| 24 | #define _ASM_X86_MTRR_H | 24 | #define ASM_X86__MTRR_H |
| 25 | 25 | ||
| 26 | #include <linux/ioctl.h> | 26 | #include <linux/ioctl.h> |
| 27 | #include <linux/errno.h> | 27 | #include <linux/errno.h> |
| @@ -170,4 +170,4 @@ struct mtrr_gentry32 { | |||
| 170 | 170 | ||
| 171 | #endif /* __KERNEL__ */ | 171 | #endif /* __KERNEL__ */ |
| 172 | 172 | ||
| 173 | #endif /* _ASM_X86_MTRR_H */ | 173 | #endif /* ASM_X86__MTRR_H */ |