diff options
author | Eric Miao <eric.miao@marvell.com> | 2008-08-06 15:51:53 +0800 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-07 19:12:59 +0100 |
commit | 0d1bde9ed102cf90165adaf7efcff7bb77658eaa (patch) | |
tree | dc31bce1335da59ace0d4b220cf0a6a2676b470c | |
parent | 7ff43535696e65333f2e335aa0063094e3001f39 (diff) | |
download | kernel_samsung_smdk4412-0d1bde9ed102cf90165adaf7efcff7bb77658eaa.zip kernel_samsung_smdk4412-0d1bde9ed102cf90165adaf7efcff7bb77658eaa.tar.gz kernel_samsung_smdk4412-0d1bde9ed102cf90165adaf7efcff7bb77658eaa.tar.bz2 |
[ARM] pxa: rename cpu-pxa.c to cpufreq-pxa2xx.c
Signed-off-by: Eric Miao <eric.miao@marvell.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r-- | arch/arm/mach-pxa/Makefile | 6 | ||||
-rw-r--r-- | arch/arm/mach-pxa/cpufreq-pxa2xx.c (renamed from arch/arm/mach-pxa/cpu-pxa.c) | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/arch/arm/mach-pxa/Makefile b/arch/arm/mach-pxa/Makefile index 3d2dea4..7ab8a2e 100644 --- a/arch/arm/mach-pxa/Makefile +++ b/arch/arm/mach-pxa/Makefile @@ -6,7 +6,11 @@ obj-y += clock.o devices.o generic.o irq.o dma.o \ time.o gpio.o reset.o obj-$(CONFIG_PM) += pm.o sleep.o standby.o -obj-$(CONFIG_CPU_FREQ) += cpu-pxa.o + +ifeq ($(CONFIG_CPU_FREQ),y) +obj-$(CONFIG_PXA25x) += cpufreq-pxa2xx.o +obj-$(CONFIG_PXA27x) += cpufreq-pxa2xx.o +endif # Generic drivers that other drivers may depend upon obj-$(CONFIG_PXA_SSP) += ssp.o diff --git a/arch/arm/mach-pxa/cpu-pxa.c b/arch/arm/mach-pxa/cpufreq-pxa2xx.c index 6f5569b..d82528e 100644 --- a/arch/arm/mach-pxa/cpu-pxa.c +++ b/arch/arm/mach-pxa/cpufreq-pxa2xx.c @@ -1,5 +1,5 @@ /* - * linux/arch/arm/mach-pxa/cpu-pxa.c + * linux/arch/arm/mach-pxa/cpufreq-pxa2xx.c * * Copyright (C) 2002,2003 Intrinsyc Software * |