From 4c133447eebf4a68fa713d63107e2d4c69403052 Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Tue, 10 May 2011 15:42:08 +0200
Subject: [PATCH] --- yaml --- r: 258575 b: refs/heads/master c:
 be2de99beaca6506a1f97a636750c108a41b5c00 h: refs/heads/master i:   258573:
 ba6126bb10a32700405800d65756892c5f8aeb3b   258571:
 008cb5bdb6136406d00917a3b7aef8fcb6d0e879   258567:
 334efe62cae147c9f879c12b57a7a23510d60aff   258559:
 4c8e681f83e46d180a8446607cc44a00e6db90d4 v: v3

---
 [refs]                                                        | 2 +-
 trunk/arch/arm/mach-s3c64xx/Makefile                          | 4 ----
 trunk/drivers/cpufreq/Makefile                                | 1 +
 .../arm/mach-s3c64xx/cpufreq.c => drivers/cpufreq/s3c64xx.c}  | 3 +--
 4 files changed, 3 insertions(+), 7 deletions(-)
 rename trunk/{arch/arm/mach-s3c64xx/cpufreq.c => drivers/cpufreq/s3c64xx.c} (99%)

diff --git a/[refs] b/[refs]
index 404b426ab25d..6f7dc426f618 100644
--- 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
index 4657363f0674..f5a7144a052f 100644
--- 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
index e2fc2d21fa61..0fd8cae1c828 100644
--- 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 b/trunk/drivers/cpufreq/s3c64xx.c
similarity index 99%
rename from trunk/arch/arm/mach-s3c64xx/cpufreq.c
rename to trunk/drivers/cpufreq/s3c64xx.c
index 4375b97588b8..fc3f18078e5d 100644
--- a/trunk/arch/arm/mach-s3c64xx/cpufreq.c
+++ b/trunk/drivers/cpufreq/s3c64xx.c
@@ -1,5 +1,4 @@
-/* linux/arch/arm/plat-s3c64xx/cpufreq.c
- *
+/*
  * Copyright 2009 Wolfson Microelectronics plc
  *
  * S3C64xx CPUfreq Support