Merge branch 'nvmf-4.8-rc' of git://git.infradead.org/nvme-fabrics into for-linus

[deliverable/linux.git] / drivers / clk / Kconfig

diff --git a/drivers/clk/Kconfig b/drivers/clk/Kconfig
index 98efbfcdb503e181d32f44a0dd0b44f286e6080a..e2d9bd760c84a04e94290c3f4d523f8c0f1266df 100644 (file)
--- a/drivers/clk/Kconfig
+++ b/drivers/clk/Kconfig
@@ -49,10 +49,10 @@ config COMMON_CLK_MAX77802
          This driver supports Maxim 77802 crystal oscillator clock.
 
 config COMMON_CLK_RK808
-       tristate "Clock driver for RK808"
+       tristate "Clock driver for RK808/RK818"
        depends on MFD_RK808
        ---help---
-         This driver supports RK808 crystal oscillator clock. These
+         This driver supports RK808 and RK818 crystal oscillator clock. These
          multi-function devices have two fixed-rate oscillators,
          clocked at 32KHz each. Clkout1 is always on, Clkout2 can off
          by control register.
@@ -203,16 +203,19 @@ config COMMON_CLK_PIC32
 
 config COMMON_CLK_OXNAS
        bool "Clock driver for the OXNAS SoC Family"
+       depends on ARCH_OXNAS || COMPILE_TEST
        select MFD_SYSCON
        ---help---
          Support for the OXNAS SoC Family clocks.
 
 source "drivers/clk/bcm/Kconfig"
 source "drivers/clk/hisilicon/Kconfig"
+source "drivers/clk/meson/Kconfig"
 source "drivers/clk/mvebu/Kconfig"
 source "drivers/clk/qcom/Kconfig"
 source "drivers/clk/renesas/Kconfig"
 source "drivers/clk/samsung/Kconfig"
+source "drivers/clk/sunxi-ng/Kconfig"
 source "drivers/clk/tegra/Kconfig"
 source "drivers/clk/ti/Kconfig"