diff options
| author | David S. Miller <davem@davemloft.net> | 2008-11-07 01:43:03 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-11-07 01:43:03 -0500 |
| commit | 9eeda9abd1faf489f3df9a1f557975f4c8650363 (patch) | |
| tree | 3e0a58e25b776cfbee193195460324dccb1886c7 /drivers/watchdog/Kconfig | |
| parent | 61c9eaf90081cbe6dc4f389e0056bff76eca19ec (diff) | |
| parent | 4bab0ea1d42dd1927af9df6fbf0003fc00617c50 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/ath5k/base.c
net/8021q/vlan_core.c
Diffstat (limited to 'drivers/watchdog/Kconfig')
| -rw-r--r-- | drivers/watchdog/Kconfig | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig index 1a22fe782a27..4fd3fa5546b1 100644 --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig | |||
| @@ -67,11 +67,11 @@ config AT91RM9200_WATCHDOG | |||
| 67 | system when the timeout is reached. | 67 | system when the timeout is reached. |
| 68 | 68 | ||
| 69 | config AT91SAM9X_WATCHDOG | 69 | config AT91SAM9X_WATCHDOG |
| 70 | tristate "AT91SAM9X watchdog" | 70 | tristate "AT91SAM9X / AT91CAP9 watchdog" |
| 71 | depends on WATCHDOG && (ARCH_AT91SAM9260 || ARCH_AT91SAM9261) | 71 | depends on ARCH_AT91 && !ARCH_AT91RM9200 |
| 72 | help | 72 | help |
| 73 | Watchdog timer embedded into AT91SAM9X chips. This will reboot your | 73 | Watchdog timer embedded into AT91SAM9X and AT91CAP9 chips. This will |
| 74 | system when the timeout is reached. | 74 | reboot your system when the timeout is reached. |
| 75 | 75 | ||
| 76 | config 21285_WATCHDOG | 76 | config 21285_WATCHDOG |
| 77 | tristate "DC21285 watchdog" | 77 | tristate "DC21285 watchdog" |