From: Michael Turquette Date: Wed, 3 Jun 2015 22:22:03 +0000 (-0700) Subject: Merge branch 'clk-next-hi6220' into clk-next X-Git-Tag: v4.2-rc1~46^2~18^2~24 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=ae8d4048fada71a77144e0f05e8612f90b9501f0;p=uclinux-h8%2Flinux.git Merge branch 'clk-next-hi6220' into clk-next Conflicts: drivers/clk/Kconfig --- ae8d4048fada71a77144e0f05e8612f90b9501f0 diff --cc drivers/clk/Kconfig index e33ff4e3e18d,8ec04156717b..1dd4f9d8bcb6 --- a/drivers/clk/Kconfig +++ b/drivers/clk/Kconfig @@@ -167,7 -150,7 +167,8 @@@ config COMMON_CLK_CDCE70 ---help--- This driver supports TI CDCE706 programmable 3-PLL clock synthesizer. +source "drivers/clk/bcm/Kconfig" + source "drivers/clk/hisilicon/Kconfig" source "drivers/clk/qcom/Kconfig" endmenu diff --cc drivers/clk/Makefile index 00ae2de0803a,971995428861..a4b9b5f4a091 --- a/drivers/clk/Makefile +++ b/drivers/clk/Makefile @@@ -48,11 -47,8 +48,9 @@@ obj-$(CONFIG_COMMON_CLK_PWM) += clk-pw 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) obj-$(CONFIG_ARCH_MMP) += mmp/ endif