diff options
| author | Michael Turquette <mturquette@linaro.org> | 2015-06-04 00:22:03 +0200 |
|---|---|---|
| committer | Michael Turquette <mturquette@linaro.org> | 2015-06-04 00:22:03 +0200 |
| commit | ae8d4048fada71a77144e0f05e8612f90b9501f0 (patch) | |
| tree | d911226fa3a204d139cbc136e7d1bb1bba4711b3 /drivers/clk/Kconfig | |
| parent | Add TI CDCE925 I2C controlled clock synthesizer driver (diff) | |
| parent | clk: hi6220: Clock driver support for Hisilicon hi6220 SoC (diff) | |
| download | linux-ae8d4048fada71a77144e0f05e8612f90b9501f0.tar.xz linux-ae8d4048fada71a77144e0f05e8612f90b9501f0.zip | |
Merge branch 'clk-next-hi6220' into clk-next
Conflicts:
drivers/clk/Kconfig
Diffstat (limited to 'drivers/clk/Kconfig')
| -rw-r--r-- | drivers/clk/Kconfig | 1 |
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 |