aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBarry Song <Baohua.Song@csr.com>2012-08-20 02:42:37 -0400
committerMike Turquette <mturquette@linaro.org>2012-08-24 15:10:04 -0400
commitbc0e489eb07f4aa2fb5cb9b7ff1fdf4b6ba3bda5 (patch)
tree359a793c6031141b3b48a39c118520b8c4c4c513
parent198678b0b8533efce832f0c99c8d35ad8fecb333 (diff)
clk: prima2: move from arch/arm/mach to drivers/clk
Signed-off-by: Barry Song <Baohua.Song@csr.com> Acked-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Mike Turquette <mturquette@linaro.org>
-rw-r--r--arch/arm/mach-prima2/Makefile1
-rw-r--r--drivers/clk/Makefile1
-rw-r--r--drivers/clk/clk-prima2.c (renamed from arch/arm/mach-prima2/clock.c)0
3 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-prima2/Makefile b/arch/arm/mach-prima2/Makefile
index 13dd1604d951..841847d56032 100644
--- a/arch/arm/mach-prima2/Makefile
+++ b/arch/arm/mach-prima2/Makefile
@@ -1,6 +1,5 @@
1obj-y := timer.o 1obj-y := timer.o
2obj-y += irq.o 2obj-y += irq.o
3obj-y += clock.o
4obj-y += rstc.o 3obj-y += rstc.o
5obj-y += prima2.o 4obj-y += prima2.o
6obj-y += rtciobrg.o 5obj-y += rtciobrg.o
diff --git a/drivers/clk/Makefile b/drivers/clk/Makefile
index 5869ea387054..d4c7253eb307 100644
--- a/drivers/clk/Makefile
+++ b/drivers/clk/Makefile
@@ -10,6 +10,7 @@ obj-$(CONFIG_ARCH_SOCFPGA) += socfpga/
10obj-$(CONFIG_PLAT_SPEAR) += spear/ 10obj-$(CONFIG_PLAT_SPEAR) += spear/
11obj-$(CONFIG_ARCH_U300) += clk-u300.o 11obj-$(CONFIG_ARCH_U300) += clk-u300.o
12obj-$(CONFIG_ARCH_INTEGRATOR) += versatile/ 12obj-$(CONFIG_ARCH_INTEGRATOR) += versatile/
13obj-$(CONFIG_ARCH_PRIMA2) += clk-prima2.o
13 14
14# Chip specific 15# Chip specific
15obj-$(CONFIG_COMMON_CLK_WM831X) += clk-wm831x.o 16obj-$(CONFIG_COMMON_CLK_WM831X) += clk-wm831x.o
diff --git a/arch/arm/mach-prima2/clock.c b/drivers/clk/clk-prima2.c
index 517874fa6858..517874fa6858 100644
--- a/arch/arm/mach-prima2/clock.c
+++ b/drivers/clk/clk-prima2.c