Merge current mainline tree into linux-omap tree

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

diff --git a/arch/arm/mach-omap2/powerdomains.h b/arch/arm/mach-omap2/powerdomains.h
index 315281148c01ab07cbb3b072c025e471debb75fa..fba34406e6500f15882bf1066c1111fc3ed5547f 100644 (file)
--- a/arch/arm/mach-omap2/powerdomains.h
+++ b/arch/arm/mach-omap2/powerdomains.h
@@ -63,7 +63,7 @@
  * XXX encode hardware fixed wakeup dependencies -- esp. for 3430 CORE
  */
 
-#include <asm/arch/powerdomain.h>
+#include <mach/powerdomain.h>
 
 #include "prcm-common.h"
 #include "prm.h"