aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorViresh Kumar <viresh.kumar@linaro.org>2013-04-04 08:54:23 -0400
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-04-10 07:19:26 -0400
commit73cc9c8cac3f86ae4efebf001b68dcecc00b0017 (patch)
treeea771271a3307e73094cec11c78549b37d91ac7a
parent7258267e56325d41f468eb650b6c23f697201645 (diff)
cpufreq: unicore2: move cpufreq driver to drivers/cpufreq
This patch moves cpufreq driver of UNICORE-2 architecture to drivers/cpufreq. Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org> Acked-by: Guan Xuetao <gxt@mprc.pku.edu.cn> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
-rw-r--r--arch/unicore32/kernel/Makefile1
-rw-r--r--drivers/cpufreq/Makefile1
-rw-r--r--drivers/cpufreq/unicore2-cpufreq.c (renamed from arch/unicore32/kernel/cpu-ucv2.c)2
3 files changed, 2 insertions, 2 deletions
diff --git a/arch/unicore32/kernel/Makefile b/arch/unicore32/kernel/Makefile
index fa497e0efe5a..607a72f2ae35 100644
--- a/arch/unicore32/kernel/Makefile
+++ b/arch/unicore32/kernel/Makefile
@@ -9,7 +9,6 @@ obj-y += setup.o signal.o sys.o stacktrace.o traps.o
9obj-$(CONFIG_MODULES) += ksyms.o module.o 9obj-$(CONFIG_MODULES) += ksyms.o module.o
10obj-$(CONFIG_EARLY_PRINTK) += early_printk.o 10obj-$(CONFIG_EARLY_PRINTK) += early_printk.o
11 11
12obj-$(CONFIG_CPU_FREQ) += cpu-ucv2.o
13obj-$(CONFIG_UNICORE_FPU_F64) += fpu-ucf64.o 12obj-$(CONFIG_UNICORE_FPU_F64) += fpu-ucf64.o
14 13
15# obj-y for architecture PKUnity v3 14# obj-y for architecture PKUnity v3
diff --git a/drivers/cpufreq/Makefile b/drivers/cpufreq/Makefile
index 3930d2e6a664..18479b27f759 100644
--- a/drivers/cpufreq/Makefile
+++ b/drivers/cpufreq/Makefile
@@ -84,3 +84,4 @@ obj-$(CONFIG_ETRAXFS) += cris-etraxfs-cpufreq.o
84obj-$(CONFIG_IA64_ACPI_CPUFREQ) += ia64-acpi-cpufreq.o 84obj-$(CONFIG_IA64_ACPI_CPUFREQ) += ia64-acpi-cpufreq.o
85obj-$(CONFIG_LOONGSON2_CPUFREQ) += loongson2_cpufreq.o 85obj-$(CONFIG_LOONGSON2_CPUFREQ) += loongson2_cpufreq.o
86obj-$(CONFIG_SH_CPU_FREQ) += sh-cpufreq.o 86obj-$(CONFIG_SH_CPU_FREQ) += sh-cpufreq.o
87obj-$(CONFIG_UNICORE32) += unicore2-cpufreq.o
diff --git a/arch/unicore32/kernel/cpu-ucv2.c b/drivers/cpufreq/unicore2-cpufreq.c
index ba5a71ce2d71..12fc904d7dab 100644
--- a/arch/unicore32/kernel/cpu-ucv2.c
+++ b/drivers/cpufreq/unicore2-cpufreq.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * linux/arch/unicore32/kernel/cpu-ucv2.c: clock scaling for the UniCore-II 2 * clock scaling for the UniCore-II
3 * 3 *
4 * Code specific to PKUnity SoC and UniCore ISA 4 * Code specific to PKUnity SoC and UniCore ISA
5 * 5 *