From 090a8c8459a85de286189e7daaf61d816c265a28 Mon Sep 17 00:00:00 2001 From: Alessandro Rubini Date: Wed, 20 Feb 2013 23:41:04 +0100 Subject: [PATCH] --- yaml --- r: 360609 b: refs/heads/master c: 41e9f3f71bc7a5d41a2b925cfdc0dc22a77f7d8c h: refs/heads/master i: 360607: 9d71cea220e8e416a3a9df1abff74d913bca7800 v: v3 --- [refs] | 2 +- trunk/drivers/watchdog/Kconfig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 54e9b7e1c95a..232a7a808b5e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e20880e60faadc03837f661533135adb4b7cde01 +refs/heads/master: 41e9f3f71bc7a5d41a2b925cfdc0dc22a77f7d8c diff --git a/trunk/drivers/watchdog/Kconfig b/trunk/drivers/watchdog/Kconfig index 0374e0edb923..9fcc70c11cea 100644 --- a/trunk/drivers/watchdog/Kconfig +++ b/trunk/drivers/watchdog/Kconfig @@ -109,7 +109,7 @@ config WM8350_WATCHDOG config ARM_SP805_WATCHDOG tristate "ARM SP805 Watchdog" - depends on ARM_AMBA + depends on ARM && ARM_AMBA select WATCHDOG_CORE help ARM Primecell SP805 Watchdog timer. This will reboot your system when