diff options
| author | Olof Johansson <olof@lixom.net> | 2012-09-05 16:16:32 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-09-05 16:16:32 -0700 |
| commit | 7ad8f8f1c5a3a92a303fcf90cb2b15205c0a7635 (patch) | |
| tree | 4c683e9206b754fba3f86a48ba41b65cd33a3cfb /drivers/watchdog | |
| parent | 63212c5ecdd558defb9aa985375626bac5a5e5a8 (diff) | |
| parent | d684f05f2d55655eee93d86974e9271010aaed09 (diff) | |
| download | blackbird-op-linux-7ad8f8f1c5a3a92a303fcf90cb2b15205c0a7635.tar.gz blackbird-op-linux-7ad8f8f1c5a3a92a303fcf90cb2b15205c0a7635.zip | |
Merge branch 'pnx4008-removal' of git://git.antcom.de/linux-2.6 into next/cleanup
Removes the pnx4008 platform support, which hasn't seen any active
development since 2006 and seems to be unused these days.
* 'pnx4008-removal' of git://git.antcom.de/linux-2.6:
ARM: mach-pnx4008: Remove architecture
Diffstat (limited to 'drivers/watchdog')
| -rw-r--r-- | drivers/watchdog/Kconfig | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig index 53d75719078e..ad1bb9382a96 100644 --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig @@ -237,12 +237,12 @@ config OMAP_WATCHDOG here to enable the OMAP1610/OMAP1710/OMAP2420/OMAP3430/OMAP4430 watchdog timer. config PNX4008_WATCHDOG - tristate "PNX4008 and LPC32XX Watchdog" - depends on ARCH_PNX4008 || ARCH_LPC32XX + tristate "LPC32XX Watchdog" + depends on ARCH_LPC32XX select WATCHDOG_CORE help Say Y here if to include support for the watchdog timer - in the PNX4008 or LPC32XX processor. + in the LPC32XX processor. This driver can be built as a module by choosing M. The module will be called pnx4008_wdt. |
