Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6

[linux-2.6] / include / asm-x86 / pat.h

diff --git a/include/asm-x86/pat.h b/include/asm-x86/pat.h
index 6fa9710ae09ac9cb9bc82d9b86854e21bd73dab2..7edc473072179c48defd9043a2ec5be0202dbbcf 100644 (file)
--- a/include/asm-x86/pat.h
+++ b/include/asm-x86/pat.h
@@ -4,10 +4,10 @@
 #include <linux/types.h>
 
 #ifdef CONFIG_X86_PAT
-extern int pat_wc_enabled;
+extern int pat_enabled;
 extern void validate_pat_support(struct cpuinfo_x86 *c);
 #else
-static const int pat_wc_enabled;
+static const int pat_enabled;
 static inline void validate_pat_support(struct cpuinfo_x86 *c) { }
 #endif