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

Commit Message

Barry Song July 19, 2012, 8:07 a.m. UTC

From: Barry Song <[e-mail]>

Signed-off-by: Barry Song <[e-mail]>
Cc: Arnd Bergmann <[e-mail]>
---
 arch/arm/mach-prima2/Makefile                      |    1 -
 drivers/clk/Makefile                               |    1 +
 .../mach-prima2/clock.c => drivers/clk/clk-sirf.c  |    0
 3 files changed, 1 insertions(+), 1 deletions(-)
 rename arch/arm/mach-prima2/clock.c => drivers/clk/clk-sirf.c (100%)

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

Comments

Arnd Bergmann July 19, 2012, 12:50 p.m. UTC | #1

On Thursday 19 July 2012, Barry Song wrote:
> From: Barry Song <[e-mail]>
> 
> Signed-off-by: Barry Song <[e-mail]>
> Cc: Arnd Bergmann <[e-mail]>

Acked-by: Arnd Bergmann <[e-mail]>

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 02ffdf6..01821bb 100644
--- a/drivers/clk/Makefile
+++ b/drivers/clk/Makefile
@@ -5,6 +5,7 @@  obj-$(CONFIG_COMMON_CLK)	+= clk.o clk-fixed-rate.o clk-gate.o \
 # SoCs specific
 obj-$(CONFIG_ARCH_HIGHBANK)	+= clk-highbank.o
 obj-$(CONFIG_ARCH_MXS)		+= mxs/
+obj-$(CONFIG_ARCH_PRIMA2)	+= clk-sirf.o
 obj-$(CONFIG_PLAT_SPEAR)	+= spear/
 obj-$(CONFIG_ARCH_U300)		+= clk-u300.o
 obj-$(CONFIG_ARCH_INTEGRATOR)	+= versatile/