diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-16 16:51:32 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-16 16:51:32 +0200 |
| commit | 5fef06e8c8c52aa7170dbbb068aa996d83738d38 (patch) | |
| tree | f46a1eefd68863bdae57afa004e5281801a6b61e /include/asm-x86/pat.h | |
| parent | 0c5d1eb77a8be917b638344a22afe1398236482b (diff) | |
| parent | 278429cff8809958d25415ba0ed32b59866ab1a8 (diff) | |
| download | kernel-crypto-5fef06e8c8c52aa7170dbbb068aa996d83738d38.tar.gz kernel-crypto-5fef06e8c8c52aa7170dbbb068aa996d83738d38.tar.xz kernel-crypto-5fef06e8c8c52aa7170dbbb068aa996d83738d38.zip | |
Merge branch 'linus' into genirq
Diffstat (limited to 'include/asm-x86/pat.h')
| -rw-r--r-- | include/asm-x86/pat.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/asm-x86/pat.h b/include/asm-x86/pat.h index 7edc4730721..482c3e3f987 100644 --- a/include/asm-x86/pat.h +++ b/include/asm-x86/pat.h @@ -1,5 +1,5 @@ -#ifndef _ASM_PAT_H -#define _ASM_PAT_H +#ifndef ASM_X86__PAT_H +#define ASM_X86__PAT_H #include <linux/types.h> @@ -19,4 +19,4 @@ extern int free_memtype(u64 start, u64 end); extern void pat_disable(char *reason); -#endif +#endif /* ASM_X86__PAT_H */ |