summaryrefslogtreecommitdiffstats
path: root/drivers/clk/Makefile
diff options
context:
space:
mode:
authorMichael Turquette <mturquette@linaro.org>2015-06-03 15:22:03 -0700
committerMichael Turquette <mturquette@linaro.org>2015-06-03 15:22:03 -0700
commitae8d4048fada71a77144e0f05e8612f90b9501f0 (patch)
treed911226fa3a204d139cbc136e7d1bb1bba4711b3 /drivers/clk/Makefile
parent19fbbbbcd3a3a8e307a4768784166abf7b55b779 (diff)
parent72ea48610d43c59507d9ad39083d40085400ba12 (diff)
downloadop-kernel-dev-ae8d4048fada71a77144e0f05e8612f90b9501f0.zip
op-kernel-dev-ae8d4048fada71a77144e0f05e8612f90b9501f0.tar.gz
Merge branch 'clk-next-hi6220' into clk-next
Conflicts: drivers/clk/Kconfig
Diffstat (limited to 'drivers/clk/Makefile')
-rw-r--r--drivers/clk/Makefile4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/clk/Makefile b/drivers/clk/Makefile
index 00ae2de..a4b9b5f 100644
--- a/drivers/clk/Makefile
+++ b/drivers/clk/Makefile
@@ -48,9 +48,7 @@ obj-$(CONFIG_COMMON_CLK_PWM) += clk-pwm.o
obj-$(CONFIG_COMMON_CLK_AT91) += at91/
obj-$(CONFIG_ARCH_BCM_MOBILE) += bcm/
obj-$(CONFIG_ARCH_BERLIN) += berlin/
-obj-$(CONFIG_ARCH_HI3xxx) += hisilicon/
-obj-$(CONFIG_ARCH_HIP04) += hisilicon/
-obj-$(CONFIG_ARCH_HIX5HD2) += hisilicon/
+obj-$(CONFIG_ARCH_HISI) += hisilicon/
obj-$(CONFIG_COMMON_CLK_KEYSTONE) += keystone/
obj-$(CONFIG_ARCH_MEDIATEK) += mediatek/
ifeq ($(CONFIG_COMMON_CLK), y)
OpenPOWER on IntegriCloud