---

yaml --- r: 258575 b: refs/heads/master c: be2de99 h: refs/heads/master i: 258573: ba6126b 258571: 008cb5b 258567: 334efe6 258559: 4c8e681 v: v3
git-mirror · Jul 13, 2011 · 4c13344 · 4c13344
1 parent 57d16e0
commit 4c13344
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 92e03c41a415e8e9e8009a1f5bbb9036f3bfb2f4
+refs/heads/master: be2de99beaca6506a1f97a636750c108a41b5c00
diff --git a/trunk/arch/arm/mach-s3c64xx/Makefile b/trunk/arch/arm/mach-s3c64xx/Makefile
@@ -23,10 +23,6 @@ obj-$(CONFIG_CPU_S3C6410)	+= s3c6410.o
 obj-y				+= irq.o
 obj-y				+= irq-eint.o
 
-# CPU frequency scaling
-
-obj-$(CONFIG_CPU_FREQ_S3C64XX)  += cpufreq.o
-
 # DMA support
 
 obj-$(CONFIG_S3C64XX_DMA)	+= dma.o

diff --git a/trunk/drivers/cpufreq/Makefile b/trunk/drivers/cpufreq/Makefile
@@ -41,3 +41,4 @@ obj-$(CONFIG_X86_CPUFREQ_NFORCE2)	+= cpufreq-nforce2.o
 
 # ARM SoC drivers
 obj-$(CONFIG_UX500_SOC_DB8500)		+= db8500-cpufreq.o
+obj-$(CONFIG_CPU_FREQ_S3C64XX)		+= s3c64xx.o
diff --git a/trunk/arch/arm/mach-s3c64xx/cpufreq.c → trunk/drivers/cpufreq/s3c64xx.c b/trunk/arch/arm/mach-s3c64xx/cpufreq.c → trunk/drivers/cpufreq/s3c64xx.c
@@ -1,5 +1,4 @@
-/* linux/arch/arm/plat-s3c64xx/cpufreq.c
- *
+/*
  * Copyright 2009 Wolfson Microelectronics plc
  *
  * S3C64xx CPUfreq Support
Original file line number	Diff line number	Diff line change
Expand Up		@@ -41,3 +41,4 @@ obj-$(CONFIG_X86_CPUFREQ_NFORCE2) += cpufreq-nforce2.o

		# ARM SoC drivers
		obj-$(CONFIG_UX500_SOC_DB8500) += db8500-cpufreq.o
		obj-$(CONFIG_CPU_FREQ_S3C64XX) += s3c64xx.o