ARM: OMAP: Move omap1 PM support to arch/arm/mach-omap1

Move omap1 PM support to arch/arm/mach-omap1

diff --git a/arch/arm/mach-omap1/Makefile b/arch/arm/mach-omap1/Makefile
index 10aa7e98068b11566d028a10e38c1d9de24b7e26..e286376731cf7d9288d6d07d722008f13ed0692d 100644 (file)
--- a/arch/arm/mach-omap1/Makefile
+++ b/arch/arm/mach-omap1/Makefile
@@ -9,6 +9,9 @@ obj-$(CONFIG_OMAP_MPU_TIMER)            += time.o
 
 led-y := leds.o
 
+# Power Management
+obj-$(CONFIG_PM) += pm.o sleep.o
+
 # Specific board support
 obj-$(CONFIG_MACH_OMAP_H2)             += board-h2.o
 obj-$(CONFIG_MACH_OMAP_INNOVATOR)      += board-innovator.o

diff --git a/arch/arm/plat-omap/pm.c b/arch/arm/mach-omap1/pm.c
similarity index 100%
rename from arch/arm/plat-omap/pm.c
rename to arch/arm/mach-omap1/pm.c

diff --git a/arch/arm/plat-omap/sleep.S b/arch/arm/mach-omap1/sleep.S
similarity index 100%
rename from arch/arm/plat-omap/sleep.S
rename to arch/arm/mach-omap1/sleep.S

diff --git a/arch/arm/plat-omap/Makefile b/arch/arm/plat-omap/Makefile
index 3b552848711a8c173b3f5004d88cc1c3581de00f..01ceab49c7d409975fd6daca0f39d34e9650fd88 100644 (file)
--- a/arch/arm/plat-omap/Makefile
+++ b/arch/arm/plat-omap/Makefile
@@ -13,9 +13,6 @@ obj-$(CONFIG_OMAP_32K_TIMER)  += timer32k.o
 # OCPI interconnect support for 1710, 1610 and 5912
 obj-$(CONFIG_ARCH_OMAP16XX) += ocpi.o
 
-# Power Management
-obj-$(CONFIG_PM) += pm.o sleep.o
-
 obj-$(CONFIG_CPU_FREQ) += cpu-omap.o
 obj-$(CONFIG_OMAP_DM_TIMER) += dmtimer.o
 obj-$(CONFIG_OMAP_BOOT_REASON) += bootreason.o