diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 9adc278a22abb36df1bdfdacd1db1fe240f8d0fb..31c289913102272560dedb9112af06e2e3be62fe 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1875,10 +1875,6 @@ config CPU_FREQ_PXA
 	default y
 	select CPU_FREQ_DEFAULT_GOV_USERSPACE
 
-config CPU_FREQ_S3C64XX
-	bool "CPUfreq support for Samsung S3C64XX CPUs"
-	depends on CPU_FREQ && CPU_S3C6410
-
 config CPU_FREQ_S3C
 	bool
 	help
diff --git a/drivers/cpufreq/Kconfig.arm b/drivers/cpufreq/Kconfig.arm
index e5c56c7b3389bb14f8364ba34d8397737f69de66..72a0044c1baa8a688e267420b0f4985e912f0a6b 100644
--- a/drivers/cpufreq/Kconfig.arm
+++ b/drivers/cpufreq/Kconfig.arm
@@ -2,6 +2,15 @@
 # ARM CPU Frequency scaling drivers
 #
 
+config ARM_S3C64XX_CPUFREQ
+	bool "Samsung S3C64XX"
+	depends on CPU_S3C6410
+	default y
+	help
+	  This adds the CPUFreq driver for Samsung S3C6410 SoC.
+
+	  If in doubt, say N.
+
 config ARM_S5PV210_CPUFREQ
 	bool "Samsung S5PV210 and S5PC110"
 	depends on CPU_S5PV210
diff --git a/drivers/cpufreq/Makefile b/drivers/cpufreq/Makefile
index 54194788b47fcd4d2327a2fe1398fb7df03659bc..ab75e573c69f443fcfc68eea1ce4817bbf5b9c8e 100644
--- a/drivers/cpufreq/Makefile
+++ b/drivers/cpufreq/Makefile
@@ -40,6 +40,6 @@ 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
+obj-$(CONFIG_ARM_S3C64XX_CPUFREQ)	+= s3c64xx-cpufreq.o
 obj-$(CONFIG_ARM_S5PV210_CPUFREQ)	+= s5pv210-cpufreq.o
 obj-$(CONFIG_ARM_EXYNOS4210_CPUFREQ)	+= exynos4210-cpufreq.o
diff --git a/drivers/cpufreq/s3c64xx.c b/drivers/cpufreq/s3c64xx-cpufreq.c
similarity index 100%
rename from drivers/cpufreq/s3c64xx.c
rename to drivers/cpufreq/s3c64xx-cpufreq.c