[v4,2/2] clk: prima2: move from arch/arm/mach to drivers/clk

Commit Message

Barry Song Aug. 20, 2012, 6:42 a.m. UTC

From: Barry Song <[e-mail]>

Signed-off-by: Barry Song <[e-mail]>
Acked-by: Arnd Bergmann <[e-mail]>
---
 -v4: rename to clk-prima2 as we will have clk-marco or others

 arch/arm/mach-prima2/Makefile                      |    1 -
 drivers/clk/Makefile                               |    1 +
 .../clock.c => drivers/clk/clk-prima2.c            |    0
 3 files changed, 1 insertions(+), 1 deletions(-)
 rename arch/arm/mach-prima2/clock.c => drivers/clk/clk-prima2.c (100%)

diff --git a/arch/arm/mach-prima2/clock.c b/drivers/clk/clk-prima2.c
similarity index 100%
rename from arch/arm/mach-prima2/clock.c
rename to drivers/clk/clk-prima2.c

Patch

diff --git a/arch/arm/mach-prima2/Makefile b/arch/arm/mach-prima2/Makefile
index 13dd160..841847d 100644
--- a/arch/arm/mach-prima2/Makefile
+++ b/arch/arm/mach-prima2/Makefile
@@ -1,6 +1,5 @@ 
 obj-y := timer.o
 obj-y += irq.o
-obj-y += clock.o
 obj-y += rstc.o
 obj-y += prima2.o
 obj-y += rtciobrg.o
diff --git a/drivers/clk/Makefile b/drivers/clk/Makefile
index 5869ea3..d4c7253 100644
--- a/drivers/clk/Makefile
+++ b/drivers/clk/Makefile
@@ -10,6 +10,7 @@  obj-$(CONFIG_ARCH_SOCFPGA)	+= socfpga/
 obj-$(CONFIG_PLAT_SPEAR)	+= spear/
 obj-$(CONFIG_ARCH_U300)		+= clk-u300.o
 obj-$(CONFIG_ARCH_INTEGRATOR)	+= versatile/
+obj-$(CONFIG_ARCH_PRIMA2)	+= clk-prima2.o
 
 # Chip specific
 obj-$(CONFIG_COMMON_CLK_WM831X) += clk-wm831x.o