diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-07-26 10:28:36 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-07-26 10:28:36 -0400 |
commit | 29308333fbe2cc61258c1c470f9403960428beb2 (patch) | |
tree | 5bfcfadf2dd2d98c2ad251c96d7ee43a6903819a /include/asm-x86/k8.h | |
parent | 024e8ac04453b3525448c31ef39848cf675ba6db (diff) | |
parent | 1503af661947b7a4a09355cc2ae6aa0d43f16776 (diff) |
Merge branch 'x86/header-guards' into x86/core
Diffstat (limited to 'include/asm-x86/k8.h')
-rw-r--r-- | include/asm-x86/k8.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/asm-x86/k8.h b/include/asm-x86/k8.h index 452e2b696ff4..2bbaf4370a55 100644 --- a/include/asm-x86/k8.h +++ b/include/asm-x86/k8.h | |||
@@ -1,5 +1,5 @@ | |||
1 | #ifndef _ASM_K8_H | 1 | #ifndef ASM_X86__K8_H |
2 | #define _ASM_K8_H 1 | 2 | #define ASM_X86__K8_H |
3 | 3 | ||
4 | #include <linux/pci.h> | 4 | #include <linux/pci.h> |
5 | 5 | ||
@@ -12,4 +12,4 @@ extern int cache_k8_northbridges(void); | |||
12 | extern void k8_flush_garts(void); | 12 | extern void k8_flush_garts(void); |
13 | extern int k8_scan_nodes(unsigned long start, unsigned long end); | 13 | extern int k8_scan_nodes(unsigned long start, unsigned long end); |
14 | 14 | ||
15 | #endif | 15 | #endif /* ASM_X86__K8_H */ |