Merge tag 'clk-for-linus-3.11' of git://git.linaro.org/people/mturquette/linux

[karo-tx-linux.git] / drivers / clk / Makefile

diff --git a/drivers/clk/Makefile b/drivers/clk/Makefile
index 2e2e957ccfb7e47378152c1a9397dc42dfa9374f..4038c2bdf334ddd4f6ac605b91292af5dabe2713 100644 (file)
--- a/drivers/clk/Makefile
+++ b/drivers/clk/Makefile
@@ -19,7 +19,7 @@ obj-$(CONFIG_ARCH_SOCFPGA)    += socfpga/
 obj-$(CONFIG_PLAT_SPEAR)       += spear/
 obj-$(CONFIG_ARCH_U300)                += clk-u300.o
 obj-$(CONFIG_COMMON_CLK_VERSATILE) += versatile/
-obj-$(CONFIG_ARCH_PRIMA2)      += clk-prima2.o
+obj-$(CONFIG_ARCH_SIRF)                += clk-prima2.o
 obj-$(CONFIG_PLAT_ORION)       += mvebu/
 ifeq ($(CONFIG_COMMON_CLK), y)
 obj-$(CONFIG_ARCH_MMP)         += mmp/
@@ -29,7 +29,7 @@ obj-$(CONFIG_ARCH_ROCKCHIP)   += rockchip/
 obj-$(CONFIG_ARCH_SUNXI)       += sunxi/
 obj-$(CONFIG_ARCH_U8500)       += ux500/
 obj-$(CONFIG_ARCH_VT8500)      += clk-vt8500.o
-obj-$(CONFIG_ARCH_ZYNQ)                += clk-zynq.o
+obj-$(CONFIG_ARCH_ZYNQ)                += zynq/
 obj-$(CONFIG_ARCH_TEGRA)       += tegra/
 obj-$(CONFIG_PLAT_SAMSUNG)     += samsung/