From 3ffec4e18484c34838fa341de3848306c29ecd5d Mon Sep 17 00:00:00 2001 From: Jouni Hogander Date: Fri, 16 May 2008 13:57:04 +0300 Subject: [PATCH] 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 Signed-off-by: Tony Lindgren --- arch/arm/mach-omap2/Makefile | 4 +++- arch/arm/mach-omap2/{pm.c => pm24xx.c} | 0 arch/arm/mach-omap2/{sleep.S => sleep24xx.S} | 0 3 files changed, 3 insertions(+), 1 deletion(-) rename arch/arm/mach-omap2/{pm.c => pm24xx.c} (100%) rename arch/arm/mach-omap2/{sleep.S => sleep24xx.S} (100%) 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 -- 2.41.1