---

yaml --- r: 324282 b: refs/heads/master c: bc0e489 h: refs/heads/master v: v3
git-mirror · Aug 24, 2012 · f974a2a · f974a2a
1 parent 9d75c32
commit f974a2a
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 198678b0b8533efce832f0c99c8d35ad8fecb333
+refs/heads/master: bc0e489eb07f4aa2fb5cb9b7ff1fdf4b6ba3bda5
diff --git a/trunk/arch/arm/mach-prima2/Makefile b/trunk/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/trunk/drivers/clk/Makefile b/trunk/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
diff --git a/trunk/arch/arm/mach-prima2/clock.c → trunk/drivers/clk/clk-prima2.c b/trunk/arch/arm/mach-prima2/clock.c → trunk/drivers/clk/clk-prima2.c