Merge tag 'v3.7-rc7' into next/cleanup
[linux-3.10.git] / arch / arm / mach-omap2 / omap_hwmod.h
similarity index 99%
rename from arch/arm/plat-omap/include/plat/omap_hwmod.h
rename to arch/arm/mach-omap2/omap_hwmod.h
index 1db0294..87a3c5b 100644 (file)
@@ -35,7 +35,6 @@
 #include <linux/list.h>
 #include <linux/ioport.h>
 #include <linux/spinlock.h>
-#include <plat/cpu.h>
 
 struct omap_device;