diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2012-03-03 08:57:03 +0900 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2012-03-07 01:36:33 -0800 |
| commit | 880bcd4a8363f24375027f9ded4670960dcfa70a (patch) | |
| tree | 31894d9dc2c29f31234e479de520a50858cce54c /drivers/watchdog | |
| parent | a5f17d1f4c2831b9b9bf8b1a537cdbac995d6e13 (diff) | |
| parent | 8c3d7c30c306d83ff9c303f42307765a5a7bc254 (diff) | |
| download | linux-880bcd4a8363f24375027f9ded4670960dcfa70a.tar.gz linux-880bcd4a8363f24375027f9ded4670960dcfa70a.tar.bz2 linux-880bcd4a8363f24375027f9ded4670960dcfa70a.zip | |
Merge branch 'topic/cleanup-s3c24xx' into next/cleanup-s3c24xx
Conflicts:
arch/arm/mach-s3c24xx/include/mach/system.h
Diffstat (limited to 'drivers/watchdog')
| -rw-r--r-- | drivers/watchdog/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig index 877b107f77a7..3aa52ba1398a 100644 --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig @@ -170,7 +170,7 @@ config HAVE_S3C2410_WATCHDOG config S3C2410_WATCHDOG tristate "S3C2410 Watchdog" - depends on ARCH_S3C2410 || HAVE_S3C2410_WATCHDOG + depends on HAVE_S3C2410_WATCHDOG select WATCHDOG_CORE help Watchdog timer block in the Samsung SoCs. This will reboot |