diff options
| author | Barry Song <Baohua.Song@csr.com> | 2012-08-20 06:42:37 +0000 |
|---|---|---|
| committer | Mike Turquette <mturquette@linaro.org> | 2012-08-24 12:10:04 -0700 |
| commit | bc0e489eb07f4aa2fb5cb9b7ff1fdf4b6ba3bda5 (patch) | |
| tree | 359a793c6031141b3b48a39c118520b8c4c4c513 | |
| parent | 198678b0b8533efce832f0c99c8d35ad8fecb333 (diff) | |
| download | linux-3.10-bc0e489eb07f4aa2fb5cb9b7ff1fdf4b6ba3bda5.tar.gz linux-3.10-bc0e489eb07f4aa2fb5cb9b7ff1fdf4b6ba3bda5.tar.bz2 linux-3.10-bc0e489eb07f4aa2fb5cb9b7ff1fdf4b6ba3bda5.zip | |
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/Makefile | 1 | ||||
| -rw-r--r-- | drivers/clk/Makefile | 1 | ||||
| -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 13dd1604d95..841847d5603 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 5869ea38705..d4c7253eb30 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 diff --git a/arch/arm/mach-prima2/clock.c b/drivers/clk/clk-prima2.c index 517874fa685..517874fa685 100644 --- a/arch/arm/mach-prima2/clock.c +++ b/drivers/clk/clk-prima2.c |