From: Tony Lindgren <tony@atomide.com>
Date: Thu, 1 Dec 2005 01:24:32 +0000 (-0800)
Subject: ARM: OMAP: Move omap1 PM support to arch/arm/mach-omap1
X-Git-Tag: v2.6.15-omap2~57
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=a57a89ee9ad70186e4f7be46e0930fcb8fb53bb6;p=linux-2.6-omap-h63xx.git

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 10aa7e98068..e286376731c 100644
--- 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 3b552848711..01ceab49c7d 100644
--- 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