projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'cando' into for-linus
[linux-2.6-microblaze.git]
/
drivers
/
watchdog
/
Kconfig
diff --git
a/drivers/watchdog/Kconfig
b/drivers/watchdog/Kconfig
index
0bf5020
..
b87ba23
100644
(file)
--- 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.