git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'core-iommu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
drivers
/
watchdog
/
Kconfig
diff --git
a/drivers/watchdog/Kconfig
b/drivers/watchdog/Kconfig
index
0e8468f
..
b87ba23
100644
(file)
--- a/
drivers/watchdog/Kconfig
+++ b/
drivers/watchdog/Kconfig
@@
-175,7
+175,7
@@
config SA1100_WATCHDOG
config MPCORE_WATCHDOG
tristate "MPcore 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.
help
Watchdog timer embedded into the MPcore system.
@@
-194,10
+194,10
@@
config EP93XX_WATCHDOG
config OMAP_WATCHDOG
tristate "OMAP Watchdog"
config OMAP_WATCHDOG
tristate "OMAP Watchdog"
- depends on ARCH_OMAP16XX || ARCH_OMAP2
|| ARCH_OMAP3
+ depends on ARCH_OMAP16XX || ARCH_OMAP2
PLUS
help
help
- Support for TI OMAP1610/OMAP1710/OMAP2420/OMAP3430 watchdog. Say 'Y'
- here to enable the OMAP1610/OMAP1710/OMAP2420/OMAP3430 watchdog timer.
+ Support for TI OMAP1610/OMAP1710/OMAP2420/OMAP3430
/OMAP4430
watchdog. Say 'Y'
+ here to enable the OMAP1610/OMAP1710/OMAP2420/OMAP3430
/OMAP4430
watchdog timer.
config PNX4008_WATCHDOG
tristate "PNX4008 Watchdog"
config PNX4008_WATCHDOG
tristate "PNX4008 Watchdog"
@@
-302,7
+302,7
@@
config TS72XX_WATCHDOG
config MAX63XX_WATCHDOG
tristate "Max63xx watchdog"
config MAX63XX_WATCHDOG
tristate "Max63xx watchdog"
- depends on ARM
+ depends on ARM
&& HAS_IOMEM
help
Support for memory mapped max63{69,70,71,72,73,74} watchdog timer.
help
Support for memory mapped max63{69,70,71,72,73,74} watchdog timer.