diff --git a/[refs] b/[refs]
index 1a48bb5b1434..1c4d326c59e9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6b447f04a9aecdf2a30c1a97e4b034ac7931bb70
+refs/heads/master: 60c20fb8c00a2b23308ae4517f145383bc66d291
diff --git a/trunk/include/linux/serial.h b/trunk/include/linux/serial.h
index 1ea8d9265bf6..9136cc5608c3 100644
--- a/trunk/include/linux/serial.h
+++ b/trunk/include/linux/serial.h
@@ -10,8 +10,9 @@
 #ifndef _LINUX_SERIAL_H
 #define _LINUX_SERIAL_H
 
-#ifdef __KERNEL__
 #include <linux/types.h>
+
+#ifdef __KERNEL__
 #include <asm/page.h>
 
 /*