summaryrefslogtreecommitdiff
path: root/drivers/clk/Kconfig
diff options
context:
space:
mode:
authorMichael Turquette <mturquette@linaro.org>2015-06-04 01:22:03 +0300
committerMichael Turquette <mturquette@linaro.org>2015-06-04 01:22:03 +0300
commitae8d4048fada71a77144e0f05e8612f90b9501f0 (patch)
treed911226fa3a204d139cbc136e7d1bb1bba4711b3 /drivers/clk/Kconfig
parent19fbbbbcd3a3a8e307a4768784166abf7b55b779 (diff)
parent72ea48610d43c59507d9ad39083d40085400ba12 (diff)
downloadlinux-ae8d4048fada71a77144e0f05e8612f90b9501f0.tar.xz
Merge branch 'clk-next-hi6220' into clk-next
Conflicts: drivers/clk/Kconfig
Diffstat (limited to 'drivers/clk/Kconfig')
-rw-r--r--drivers/clk/Kconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/clk/Kconfig b/drivers/clk/Kconfig
index e33ff4e3e18d..1dd4f9d8bcb6 100644
--- a/drivers/clk/Kconfig
+++ b/drivers/clk/Kconfig
@@ -168,6 +168,7 @@ config COMMON_CLK_CDCE706
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