Merge current mainline tree into linux-omap tree

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

diff --git a/arch/arm/mach-omap2/pm34xx.c b/arch/arm/mach-omap2/pm34xx.c
index fc72c11e5828ad8c882136fc6a5c3d41cbe0ee53..a57cf4172a0c965eb6633fe33ac47d9bd78e88fc 100644 (file)
--- a/arch/arm/mach-omap2/pm34xx.c
+++ b/arch/arm/mach-omap2/pm34xx.c
@@ -24,11 +24,11 @@
 #include <linux/list.h>
 #include <linux/err.h>
 
-#include <asm/arch/gpio.h>
-#include <asm/arch/sram.h>
-#include <asm/arch/pm.h>
-#include <asm/arch/clockdomain.h>
-#include <asm/arch/powerdomain.h>
+#include <mach/gpio.h>
+#include <mach/sram.h>
+#include <mach/pm.h>
+#include <mach/clockdomain.h>
+#include <mach/powerdomain.h>
 
 #include "cm.h"
 #include "cm-regbits-34xx.h"