diff --git a/[refs] b/[refs]
index ca7b6e128f9f..2026bbe2ac03 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3ac6c7b44560fdf2ea8865536bd52d4ff038107e
+refs/heads/master: 2c23d62abb820e19c54012520f08a198c2233a85
diff --git a/trunk/include/asm-x86_64/mtrr.h b/trunk/include/asm-x86_64/mtrr.h
index 4a0610c185eb..d6135b2549bf 100644
--- a/trunk/include/asm-x86_64/mtrr.h
+++ b/trunk/include/asm-x86_64/mtrr.h
@@ -24,7 +24,6 @@
 #define _LINUX_MTRR_H
 
 #include <linux/ioctl.h>
-#include <linux/compat.h>
 
 #define	MTRR_IOCTL_BASE	'M'
 
@@ -101,11 +100,10 @@ static __inline__ int mtrr_del_page (int reg, unsigned long base,
     return -ENODEV;
 }
 
-#  endif
-
-#endif
+#endif /* CONFIG_MTRR */
 
 #ifdef CONFIG_COMPAT
+#include <linux/compat.h>
 
 struct mtrr_sentry32
 {
@@ -137,4 +135,6 @@ struct mtrr_gentry32
 
 #endif /* CONFIG_COMPAT */
 
+#endif /* __KERNEL__ */
+
 #endif  /*  _LINUX_MTRR_H  */