Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / arch / arm / mach-omap2 / powerdomains34xx.h

diff --git a/arch/arm/mach-omap2/powerdomains34xx.h b/arch/arm/mach-omap2/powerdomains34xx.h
index 0c07bf75715b380b4aea4756d0e2b0f484d66d86..adbfa9187a6c715c555ee7b3fe4f57c94f07e013 100644 (file)
--- a/arch/arm/mach-omap2/powerdomains34xx.h
+++ b/arch/arm/mach-omap2/powerdomains34xx.h
@@ -20,7 +20,7 @@
  * the array in mach-omap2/powerdomains.h.
  */
 
-#include <asm/arch/powerdomain.h>
+#include <mach/powerdomain.h>
 
 #include "prcm-common.h"
 #include "prm.h"