diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-14 21:28:42 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-14 21:28:42 -0700 |
| commit | bfcf1ae2b2b1c09ee2c420313afe47ac5cc32d3f (patch) | |
| tree | 0f39384efa6cecbdf71fc9bbaffd9054d2369dbd /drivers/watchdog/Kconfig | |
| parent | ecbb458a484fd9c455f8feb36c87727e71b4ac1a (diff) | |
| parent | 98af057092f8f0dabe63c5df08adc2bbfbddb1d2 (diff) | |
| download | blackbird-obmc-linux-bfcf1ae2b2b1c09ee2c420313afe47ac5cc32d3f.tar.gz blackbird-obmc-linux-bfcf1ae2b2b1c09ee2c420313afe47ac5cc32d3f.zip | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
ARM: 6126/1: ARM mpcore_wdt: fix build failure and other fixes
ARM: 6125/1: ARM TWD: move TWD registers to common header
ARM: 6110/1: Fix Thumb-2 kernel builds when UACCESS_WITH_MEMCPY is enabled
ARM: 6112/1: Use the Inner Shareable I-cache and BTB ops on ARMv7 SMP
ARM: 6111/1: Implement read/write for ownership in the ARMv6 DMA cache ops
ARM: 6106/1: Implement copy_to_user_page() for noMMU
ARM: 6105/1: Fix the __arm_ioremap_caller() definition in nommu.c
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 0bf5020d0d32..b87ba23442d2 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. |
