Merge current mainline tree into linux-omap tree

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

diff --git a/arch/arm/plat-omap/component-version.c b/arch/arm/plat-omap/component-version.c
index a9fe63d5e729452d9b29ccd7fbfabbe315c7b9fa..3c9d5230cd827d3f1e73e3694e19a5f17fbf8438 100644 (file)
--- a/arch/arm/plat-omap/component-version.c
+++ b/arch/arm/plat-omap/component-version.c
@@ -13,8 +13,8 @@
 #include <linux/module.h>
 #include <linux/err.h>
 #include <linux/proc_fs.h>
-#include <asm/arch/board.h>
-#include <asm/arch/board-nokia.h>
+#include <mach/board.h>
+#include <mach/board-nokia.h>
 
 static int component_version_read_proc(char *page, char **start, off_t off,
                                       int count, int *eof, void *data)