Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / arch / arm / include / asm / setup.h

diff --git a/arch/arm/include/asm/setup.h b/arch/arm/include/asm/setup.h
index 7ffbb29a0e9dc3e03e8ee1a5b53042e366ce6a59..2e0b9e04f12e85176aeb38b84baf3a6e84a08b60 100644 (file)
--- a/arch/arm/include/asm/setup.h
+++ b/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