From 8cb0a3aeaa966f183af987f8d1abdad385245b58 Mon Sep 17 00:00:00 2001 From: Eric Miao Date: Wed, 6 Aug 2008 15:51:53 +0800 Subject: [PATCH] --- yaml --- r: 112474 b: refs/heads/master c: 0d1bde9ed102cf90165adaf7efcff7bb77658eaa h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-pxa/Makefile | 6 +++++- trunk/arch/arm/mach-pxa/{cpu-pxa.c => cpufreq-pxa2xx.c} | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) rename trunk/arch/arm/mach-pxa/{cpu-pxa.c => cpufreq-pxa2xx.c} (99%) diff --git a/[refs] b/[refs] index a1e5790292a4..6b570039c0dd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7ff43535696e65333f2e335aa0063094e3001f39 +refs/heads/master: 0d1bde9ed102cf90165adaf7efcff7bb77658eaa diff --git a/trunk/arch/arm/mach-pxa/Makefile b/trunk/arch/arm/mach-pxa/Makefile index 3d2dea4afb87..7ab8a2eddd11 100644 --- a/trunk/arch/arm/mach-pxa/Makefile +++ b/trunk/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/trunk/arch/arm/mach-pxa/cpu-pxa.c b/trunk/arch/arm/mach-pxa/cpufreq-pxa2xx.c similarity index 99% rename from trunk/arch/arm/mach-pxa/cpu-pxa.c rename to trunk/arch/arm/mach-pxa/cpufreq-pxa2xx.c index 6f5569bac131..d82528e74bd0 100644 --- a/trunk/arch/arm/mach-pxa/cpu-pxa.c +++ b/trunk/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 *