Merge branch 'clk-next-hi6220' into clk-next
authorMichael Turquette <mturquette@linaro.org>
Wed, 3 Jun 2015 22:22:03 +0000 (15:22 -0700)
committerMichael Turquette <mturquette@linaro.org>
Wed, 3 Jun 2015 22:22:03 +0000 (15:22 -0700)
Conflicts:
drivers/clk/Kconfig

1  2 
drivers/clk/Kconfig
drivers/clk/Makefile

@@@ -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
@@@ -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