Merge remote-tracking branch 'origin/master' into perf/core

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

diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index 21865e2..fd79686 100644 (file)
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -489,16 +489,10 @@ config IXP4XX_WATCHDOG
 
          Say N if you are unsure.
 
-config HAVE_S3C2410_WATCHDOG
-       bool
-       help
-         This will include watchdog timer support for Samsung SoCs. If
-         you want to include watchdog support for any machine, kindly
-         select this in the respective mach-XXXX/Kconfig file.
-
 config S3C2410_WATCHDOG
        tristate "S3C2410 Watchdog"
-       depends on HAVE_S3C2410_WATCHDOG || COMPILE_TEST
+       depends on ARCH_S3C24XX || ARCH_S3C64XX || ARCH_S5PV210 || ARCH_EXYNOS || \
+                  COMPILE_TEST
        select WATCHDOG_CORE
        select MFD_SYSCON if ARCH_EXYNOS
        help