summaryrefslogtreecommitdiff
path: root/drivers/clk/Kconfig
diff options
context:
space:
mode:
authorMichael Turquette <mturquette@baylibre.com>2016-03-02 03:23:40 +0300
committerMichael Turquette <mturquette@baylibre.com>2016-03-02 03:23:40 +0300
commit3b0f4ae3e9f101ecfd918efd2a82fca0ae0b6c95 (patch)
treeaa530b9801bd3acdb77cd10c15e6e344115acc84 /drivers/clk/Kconfig
parent811a498e5e9ab802cbd23a8ef9c844ec92450fa4 (diff)
parent8a8b6eb7a87f12804f44128d6e4c59b19f224308 (diff)
downloadlinux-3b0f4ae3e9f101ecfd918efd2a82fca0ae0b6c95.tar.xz
Merge branch 'clk-ti' 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 15f548ad0207..16f7d33421d8 100644
--- a/drivers/clk/Kconfig
+++ b/drivers/clk/Kconfig
@@ -203,5 +203,6 @@ source "drivers/clk/mvebu/Kconfig"
source "drivers/clk/qcom/Kconfig"
source "drivers/clk/samsung/Kconfig"
source "drivers/clk/tegra/Kconfig"
+source "drivers/clk/ti/Kconfig"
endmenu