From da42801f92e1d46e60af3820d92f770817636399 Mon Sep 17 00:00:00 2001 From: Kevin Wells Date: Tue, 17 Aug 2010 17:45:28 -0700 Subject: [PATCH] --- yaml --- r: 210741 b: refs/heads/master c: 0a18e15598274b79ce14342ce0bfb76a87dadb45 h: refs/heads/master i: 210739: ddc7db1a5a91e6c4d7c00618c6db277afdc80ea2 v: v3 --- [refs] | 2 +- trunk/drivers/watchdog/Kconfig | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 72d26d1686c7..31e68d38da12 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0e901bed4e053098f1c8411dcbf21324b7f61775 +refs/heads/master: 0a18e15598274b79ce14342ce0bfb76a87dadb45 diff --git a/trunk/drivers/watchdog/Kconfig b/trunk/drivers/watchdog/Kconfig index b036677df8c4..24efd8ea41bb 100644 --- a/trunk/drivers/watchdog/Kconfig +++ b/trunk/drivers/watchdog/Kconfig @@ -213,11 +213,11 @@ config OMAP_WATCHDOG here to enable the OMAP1610/OMAP1710/OMAP2420/OMAP3430/OMAP4430 watchdog timer. config PNX4008_WATCHDOG - tristate "PNX4008 Watchdog" - depends on ARCH_PNX4008 + tristate "PNX4008 and LPC32XX Watchdog" + depends on ARCH_PNX4008 || ARCH_LPC32XX help Say Y here if to include support for the watchdog timer - in the PNX4008 processor. + in the PNX4008 or LPC32XX processor. This driver can be built as a module by choosing M. The module will be called pnx4008_wdt.