diff --git a/[refs] b/[refs]
index 70a1a07763c2..d9cfef67e9a2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f100e6d0368742ddb8b6b9be986536e63117c05a
+refs/heads/master: 4af3bf6b393a2cec947cd42cc10fc03f5b782484
diff --git a/trunk/arch/arm/include/asm/setup.h b/trunk/arch/arm/include/asm/setup.h
index f2cd18a0932b..ee1304f22f94 100644
--- a/trunk/arch/arm/include/asm/setup.h
+++ b/trunk/arch/arm/include/asm/setup.h
@@ -14,7 +14,7 @@
 #ifndef __ASMARM_SETUP_H
 #define __ASMARM_SETUP_H
 
-#include <asm/types.h>
+#include <linux/types.h>
 
 #define COMMAND_LINE_SIZE 1024