From f974a2a80cd0a19828c5a5f63162d707094d30ac Mon Sep 17 00:00:00 2001 From: Barry Song Date: Mon, 20 Aug 2012 06:42:37 +0000 Subject: [PATCH] --- yaml --- r: 324282 b: refs/heads/master c: bc0e489eb07f4aa2fb5cb9b7ff1fdf4b6ba3bda5 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-prima2/Makefile | 1 - trunk/drivers/clk/Makefile | 1 + .../{arch/arm/mach-prima2/clock.c => drivers/clk/clk-prima2.c} | 0 4 files changed, 2 insertions(+), 2 deletions(-) rename trunk/{arch/arm/mach-prima2/clock.c => drivers/clk/clk-prima2.c} (100%) diff --git a/[refs] b/[refs] index 4816d3621572..6c68b70d0018 100644 --- 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 index 13dd1604d951..841847d56032 100644 --- 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 index 5869ea387054..d4c7253eb307 100644 --- 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 b/trunk/drivers/clk/clk-prima2.c similarity index 100% rename from trunk/arch/arm/mach-prima2/clock.c rename to trunk/drivers/clk/clk-prima2.c