Merge tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux

[linux-2.6-microblaze.git] / drivers / reset / Kconfig

diff --git a/drivers/reset/Kconfig b/drivers/reset/Kconfig
index 07d162b..71ab75a 100644 (file)
--- a/drivers/reset/Kconfig
+++ b/drivers/reset/Kconfig
@@ -35,6 +35,13 @@ config RESET_AXS10X
        help
          This enables the reset controller driver for AXS10x.
 
+config RESET_BCM6345
+       bool "BCM6345 Reset Controller"
+       depends on BMIPS_GENERIC || COMPILE_TEST
+       default BMIPS_GENERIC
+       help
+         This enables the reset controller driver for BCM6345 SoCs.
+
 config RESET_BERLIN
        bool "Berlin Reset Driver" if COMPILE_TEST
        default ARCH_BERLIN
@@ -95,7 +102,8 @@ config RESET_LPC18XX
          This enables the reset controller driver for NXP LPC18xx/43xx SoCs.
 
 config RESET_MESON
-       bool "Meson Reset Driver" if COMPILE_TEST
+       tristate "Meson Reset Driver"
+       depends on ARCH_MESON || COMPILE_TEST
        default ARCH_MESON
        help
          This enables the reset driver for Amlogic Meson SoCs.