Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / arch / arm / mach-omap2 / id.c

diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c
index c7f9ab7efdca01bbb3d35dfa7b825bc4c069469e..a526c0fc628d94553dfef5d23ce0773be9127aa2 100644 (file)
--- a/arch/arm/mach-omap2/id.c
+++ b/arch/arm/mach-omap2/id.c
@@ -16,9 +16,9 @@
 #include <linux/init.h>
 #include <linux/io.h>
 
-#include <asm/arch/common.h>
-#include <asm/arch/control.h>
-#include <asm/arch/cpu.h>
+#include <mach/common.h>
+#include <mach/control.h>
+#include <mach/cpu.h>
 
 static u32 class;
 static void __iomem *tap_base;