ARM: arm-soc: Merge branch 'next/clk' into next/pm
[linux-3.10.git] / arch / arm / mach-omap2 / pm.c
index ef668c7..f4b3143 100644 (file)
 
 #include <asm/system_misc.h>
 
-#include <plat/omap-pm.h>
-#include <plat/omap_device.h>
+#include "omap-pm.h"
+#include "omap_device.h"
 #include "common.h"
 
+#include "soc.h"
 #include "prcm-common.h"
 #include "voltage.h"
 #include "powerdomain.h"