From: David Brownell <dbrownell@users.sourceforge.net>
Date: Thu, 30 Nov 2006 22:44:32 +0000 (-0800)
Subject: remove duplicate omap watchdog kconfig entry
X-Git-Tag: v2.6.19-omap1~30
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=8a1f18084869f63042dac4fc43bec350919940f9;p=linux-2.6-omap-h63xx.git

remove duplicate omap watchdog kconfig entry

I suspect this dup joined us when the driver got merged upstream.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
---

diff --git a/drivers/char/watchdog/Kconfig b/drivers/char/watchdog/Kconfig
index 1bbd167da52..0187b118532 100644
--- a/drivers/char/watchdog/Kconfig
+++ b/drivers/char/watchdog/Kconfig
@@ -750,11 +750,4 @@ config USBPCWATCHDOG
 
 	  Most people will say N.
 
-config OMAP_WATCHDOG
-	tristate "OMAP Watchdog"
-	depends on WATCHDOG && (ARCH_OMAP16XX || ARCH_OMAP24XX)
-	help
-	  Support for TI OMAP1610/OMAP1710/OMAP2420 watchdog. Say 'Y' here to enable the
-	  OMAP1610/OMAP1710 watchdog timer.
-
 endmenu