Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

[mv-sheeva.git] / drivers / watchdog / at91sam9_wdt.c

diff --git a/drivers/watchdog/at91sam9_wdt.c b/drivers/watchdog/at91sam9_wdt.c
index 435b0573fb0a4ba30060fca99fb04fe37d45d478..eac26021e8da2e2681c6c0f82eb9a40d2292c0af 100644 (file)
--- a/drivers/watchdog/at91sam9_wdt.c
+++ b/drivers/watchdog/at91sam9_wdt.c
@@ -156,7 +156,8 @@ static int at91_wdt_settimeout(unsigned int timeout)
 
 static const struct watchdog_info at91_wdt_info = {
        .identity       = DRV_NAME,
-       .options        = WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING,
+       .options        = WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING |
+                                               WDIOF_MAGICCLOSE,
 };
 
 /*