diff options
author | Eric Miao <eric.miao@marvell.com> | 2008-08-06 03:51:53 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-07 14:12:59 -0400 |
commit | 0d1bde9ed102cf90165adaf7efcff7bb77658eaa (patch) | |
tree | dc31bce1335da59ace0d4b220cf0a6a2676b470c /arch/arm/mach-pxa | |
parent | 7ff43535696e65333f2e335aa0063094e3001f39 (diff) |
[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>
Diffstat (limited to 'arch/arm/mach-pxa')
-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 3d2dea4afb87..7ab8a2eddd11 100644 --- a/arch/arm/mach-pxa/Makefile +++ b/arch/arm/mach-pxa/Makefile | |||
@@ -6,7 +6,11 @@ | |||
6 | obj-y += clock.o devices.o generic.o irq.o dma.o \ | 6 | obj-y += clock.o devices.o generic.o irq.o dma.o \ |
7 | time.o gpio.o reset.o | 7 | time.o gpio.o reset.o |
8 | obj-$(CONFIG_PM) += pm.o sleep.o standby.o | 8 | obj-$(CONFIG_PM) += pm.o sleep.o standby.o |
9 | obj-$(CONFIG_CPU_FREQ) += cpu-pxa.o | 9 | |
10 | ifeq ($(CONFIG_CPU_FREQ),y) | ||
11 | obj-$(CONFIG_PXA25x) += cpufreq-pxa2xx.o | ||
12 | obj-$(CONFIG_PXA27x) += cpufreq-pxa2xx.o | ||
13 | endif | ||
10 | 14 | ||
11 | # Generic drivers that other drivers may depend upon | 15 | # Generic drivers that other drivers may depend upon |
12 | obj-$(CONFIG_PXA_SSP) += ssp.o | 16 | 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 6f5569bac131..d82528e74bd0 100644 --- a/arch/arm/mach-pxa/cpu-pxa.c +++ b/arch/arm/mach-pxa/cpufreq-pxa2xx.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * linux/arch/arm/mach-pxa/cpu-pxa.c | 2 | * linux/arch/arm/mach-pxa/cpufreq-pxa2xx.c |
3 | * | 3 | * |
4 | * Copyright (C) 2002,2003 Intrinsyc Software | 4 | * Copyright (C) 2002,2003 Intrinsyc Software |
5 | * | 5 | * |