From fba94fd87fc545251aa78f36789ef7486607c7d2 Mon Sep 17 00:00:00 2001 From: Marc Zyngier Date: Mon, 29 Mar 2010 20:09:14 +0100 Subject: [PATCH] --- yaml --- r: 189543 b: refs/heads/master c: 5e8037166497f8a1aa46325ed7febf0408d45caa h: refs/heads/master i: 189541: 0353397bf123d889504334ce53d7ac464f2b256b 189539: bd3cfb6103d202b71d0f8c61940b490c40984275 189535: 4f242c7ba984139b0dc84ce988b582dcd52df00e v: v3 --- [refs] | 2 +- trunk/drivers/watchdog/Kconfig | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index c7a33bf0cb08..13c1d9e68356 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 35c79780064976cf9d7537a00e59f97c2061fa7d +refs/heads/master: 5e8037166497f8a1aa46325ed7febf0408d45caa diff --git a/trunk/drivers/watchdog/Kconfig b/trunk/drivers/watchdog/Kconfig index bdcdbd53da89..0e8468ffd100 100644 --- a/trunk/drivers/watchdog/Kconfig +++ b/trunk/drivers/watchdog/Kconfig @@ -55,11 +55,6 @@ config SOFT_WATCHDOG To compile this driver as a module, choose M here: the module will be called softdog. -config MAX63XX_WATCHDOG - tristate "Max63xx watchdog" - help - Support for memory mapped max63{69,70,71,72,73,74} watchdog timer. - config WM831X_WATCHDOG tristate "WM831x watchdog" depends on MFD_WM831X @@ -305,6 +300,12 @@ config TS72XX_WATCHDOG To compile this driver as a module, choose M here: the module will be called ts72xx_wdt. +config MAX63XX_WATCHDOG + tristate "Max63xx watchdog" + depends on ARM + help + Support for memory mapped max63{69,70,71,72,73,74} watchdog timer. + # AVR32 Architecture config AT32AP700X_WDT