Merge tag 'nfs-for-3.15-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs

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

diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index f3e5eff..74ec8fc 100644 (file)
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -301,7 +301,7 @@ config DAVINCI_WATCHDOG
 
 config ORION_WATCHDOG
        tristate "Orion watchdog"
 
 config ORION_WATCHDOG
        tristate "Orion watchdog"

-       depends on ARCH_ORION5X || ARCH_KIRKWOOD || ARCH_DOVE || MACH_DOVE
+       depends on ARCH_ORION5X || ARCH_KIRKWOOD || ARCH_DOVE || MACH_DOVE || ARCH_MVEBU

        select WATCHDOG_CORE
        help
          Say Y here if to include support for the watchdog timer
        select WATCHDOG_CORE
        help
          Say Y here if to include support for the watchdog timer


@@ -553,7 +553,7 @@ config GEODE_WDT
 
 config SC520_WDT
        tristate "AMD Elan SC520 processor Watchdog"
 
 config SC520_WDT
        tristate "AMD Elan SC520 processor Watchdog"

-       depends on X86
+       depends on MELAN

        help
          This is the driver for the hardware watchdog built in to the
          AMD "Elan" SC520 microcomputer commonly used in embedded systems.
        help
          This is the driver for the hardware watchdog built in to the
          AMD "Elan" SC520 microcomputer commonly used in embedded systems.