Merge branch 'x86/mce' into x86/urgent
[sfrench/cifs-2.6.git] / arch / arm / mach-omap2 / powerdomain.c
index f00289abd30f6f51d015f6f3cf932d77eb868ffc..b6990e37778341e98b65418668d473982e1583b7 100644 (file)
@@ -31,9 +31,9 @@
 #include "prm.h"
 #include "prm-regbits-34xx.h"
 
-#include <mach/cpu.h>
-#include <mach/powerdomain.h>
-#include <mach/clockdomain.h>
+#include <plat/cpu.h>
+#include <plat/powerdomain.h>
+#include <plat/clockdomain.h>
 
 #include "pm.h"