Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / arch / arm / plat-omap / bootreason.c

diff --git a/arch/arm/plat-omap/bootreason.c b/arch/arm/plat-omap/bootreason.c
index 253dfcf1ecc211b3e476d1f07819bd99907bd85c..d527b1bb06f2858eb7cba8f84d053e69815f1955 100644 (file)
--- a/arch/arm/plat-omap/bootreason.c
+++ b/arch/arm/plat-omap/bootreason.c
@@ -29,7 +29,7 @@
  */
 #include <linux/proc_fs.h>
 #include <linux/errno.h>
-#include <asm/arch/board.h>
+#include <mach/board.h>
 
 static char boot_reason[16];