diff options
author | Srinidhi Kasagar <srinidhi.kasagar@stericsson.com> | 2010-05-12 05:53:26 +0100 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-05-12 11:18:14 +0100 |
commit | 98af057092f8f0dabe63c5df08adc2bbfbddb1d2 (patch) | |
tree | e67a50fcceb973cbaa0457aa131d905acbbe96d4 /drivers/watchdog/Kconfig | |
parent | f4a27aed48584b9e4699e9ee76288618a8574d77 (diff) | |
download | op-kernel-dev-98af057092f8f0dabe63c5df08adc2bbfbddb1d2.zip op-kernel-dev-98af057092f8f0dabe63c5df08adc2bbfbddb1d2.tar.gz |
ARM: 6126/1: ARM mpcore_wdt: fix build failure and other fixes
This fixes the build failures seen when building mpcore_wdt and it
also removes the nonexistent ARM_MPCORE_PLATFORM dependency, instead
make it dependent on HAVE_ARM_TWD.
Also this fixes spinlock usage appropriately.
Signed-off-by: srinidhi kasagar <srinidhi.kasagar@stericsson.com>
Acked-by: Linus Walleij <linus.walleij@stericsson.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'drivers/watchdog/Kconfig')
-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 0bf5020..b87ba23 100644 --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig @@ -175,7 +175,7 @@ config SA1100_WATCHDOG config MPCORE_WATCHDOG tristate "MPcore watchdog" - depends on ARM_MPCORE_PLATFORM && LOCAL_TIMERS + depends on HAVE_ARM_TWD help Watchdog timer embedded into the MPcore system. |