Merge branches 'clk-mediatek', 'clk-sunplus', 'clk-loongson' and 'clk-socfpga' into...

[linux-block.git] / drivers / clk / Makefile

diff --git a/drivers/clk/Makefile b/drivers/clk/Makefile
index 7bbf77acf181eee6ed13d50ff2a336effb49328c..9b7a414b5614ecbf34065532fa4b02b22c3d1baf 100644 (file)
--- a/drivers/clk/Makefile
+++ b/drivers/clk/Makefile
@@ -43,6 +43,8 @@ obj-$(CONFIG_COMMON_CLK_K210)         += clk-k210.o
 obj-$(CONFIG_LMK04832)                 += clk-lmk04832.o
 obj-$(CONFIG_COMMON_CLK_LAN966X)       += clk-lan966x.o
 obj-$(CONFIG_COMMON_CLK_LOCHNAGAR)     += clk-lochnagar.o
+obj-$(CONFIG_MACH_LOONGSON32)          += clk-loongson1.o
+obj-$(CONFIG_COMMON_CLK_LOONGSON2)     += clk-loongson2.o
 obj-$(CONFIG_COMMON_CLK_MAX77686)      += clk-max77686.o
 obj-$(CONFIG_COMMON_CLK_MAX9485)       += clk-max9485.o
 obj-$(CONFIG_ARCH_MILBEAUT_M10V)       += clk-milbeaut.o
@@ -73,6 +75,7 @@ obj-$(CONFIG_COMMON_CLK_TPS68470)      += clk-tps68470.o
 obj-$(CONFIG_CLK_TWL6040)              += clk-twl6040.o
 obj-$(CONFIG_ARCH_VT8500)              += clk-vt8500.o
 obj-$(CONFIG_COMMON_CLK_RS9_PCIE)      += clk-renesas-pcie.o
+obj-$(CONFIG_COMMON_CLK_SI521XX)       += clk-si521xx.o
 obj-$(CONFIG_COMMON_CLK_VC5)           += clk-versaclock5.o
 obj-$(CONFIG_COMMON_CLK_VC7)           += clk-versaclock7.o
 obj-$(CONFIG_COMMON_CLK_WM831X)                += clk-wm831x.o
@@ -94,7 +97,6 @@ obj-y                                 += imx/
 obj-y                                  += ingenic/
 obj-$(CONFIG_ARCH_K3)                  += keystone/
 obj-$(CONFIG_ARCH_KEYSTONE)            += keystone/
-obj-$(CONFIG_MACH_LOONGSON32)          += loongson1/
 obj-y                                  += mediatek/
 obj-$(CONFIG_ARCH_MESON)               += meson/
 obj-y                                  += microchip/