From: Jouni Hogander <jouni.hogander@nokia.com>
Date: Fri, 16 May 2008 10:57:04 +0000 (+0300)
Subject: 24XX: PM: Move pm.c to pm24xx.c and sleep.S to sleep24xx.S
X-Git-Tag: v2.6.26-omap1~123^2~82
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=3ffec4e18484c34838fa341de3848306c29ecd5d;p=linux-2.6-omap-h63xx.git

24XX: PM: Move pm.c to pm24xx.c and sleep.S to sleep24xx.S

Rename filenames to prepare 34XX additions.
Compile omap2 code only if CONFIG_ARCH_OMAP2 is defined.

Signed-off-by: Jouni Hogander <jouni.hogander@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
---

diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile
index 13d0043def8..1199274d8e1 100644
--- a/arch/arm/mach-omap2/Makefile
+++ b/arch/arm/mach-omap2/Makefile
@@ -12,7 +12,9 @@ obj-$(CONFIG_ARCH_OMAP2)		+= sram24xx.o
 obj-$(CONFIG_ARCH_OMAP3)		+= sram34xx.o
 
 # Power Management
-obj-$(CONFIG_PM) += pm.o sleep.o
+ifeq ($(CONFIG_ARCH_OMAP2),y)
+obj-$(CONFIG_PM) += pm24xx.o sleep24xx.o
+endif
 
 # Clock framework
 obj-$(CONFIG_ARCH_OMAP2)		+= clock24xx.o
diff --git a/arch/arm/mach-omap2/pm.c b/arch/arm/mach-omap2/pm24xx.c
similarity index 100%
rename from arch/arm/mach-omap2/pm.c
rename to arch/arm/mach-omap2/pm24xx.c
diff --git a/arch/arm/mach-omap2/sleep.S b/arch/arm/mach-omap2/sleep24xx.S
similarity index 100%
rename from arch/arm/mach-omap2/sleep.S
rename to arch/arm/mach-omap2/sleep24xx.S