Merge current mainline tree into linux-omap tree

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

diff --git a/arch/arm/mach-omap2/smartreflex.c b/arch/arm/mach-omap2/smartreflex.c
index 5b15d18a07397f3da50013f25f0d8f48042c2a48..ffd49d114904e31f393c5c2a3c2b7b0a5a0bf852 100644 (file)
--- a/arch/arm/mach-omap2/smartreflex.c
+++ b/arch/arm/mach-omap2/smartreflex.c
@@ -27,9 +27,9 @@
 #include <linux/i2c/twl4030.h>
 #include <linux/io.h>
 
-#include <asm/arch/omap34xx.h>
-#include <asm/arch/control.h>
-#include <asm/arch/clock.h>
+#include <mach/omap34xx.h>
+#include <mach/control.h>
+#include <mach/clock.h>
 
 #include "prm.h"
 #include "smartreflex.h"