summaryrefslogtreecommitdiffstats
path: root/drivers/clk/Kconfig
diff options
context:
space:
mode:
authorKukjin Kim2014-05-25 22:20:25 +0200
committerKukjin Kim2014-05-25 22:20:25 +0200
commit985326c9f65a4c1a3b5ab875e6ce0c97c39449ec (patch)
treead32fb4216bea6dd39d0f05d246f354e1dc00bcc /drivers/clk/Kconfig
parentARM: EXYNOS: Add MCPM call-back functions (diff)
parentclk: exynos5420: Add 5800 specific clocks (diff)
downloadkernel-qcow2-linux-985326c9f65a4c1a3b5ab875e6ce0c97c39449ec.tar.gz
kernel-qcow2-linux-985326c9f65a4c1a3b5ab875e6ce0c97c39449ec.tar.xz
kernel-qcow2-linux-985326c9f65a4c1a3b5ab875e6ce0c97c39449ec.zip
Merge branch 'v3.16-next/clk-samsung' into v3.16-next/cpuidle-exynos
Diffstat (limited to 'drivers/clk/Kconfig')
-rw-r--r--drivers/clk/Kconfig2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/clk/Kconfig b/drivers/clk/Kconfig
index 6f56d3a4f010..ba2436622645 100644
--- a/drivers/clk/Kconfig
+++ b/drivers/clk/Kconfig
@@ -115,3 +115,5 @@ endmenu
source "drivers/clk/bcm/Kconfig"
source "drivers/clk/mvebu/Kconfig"
+
+source "drivers/clk/samsung/Kconfig"