summaryrefslogtreecommitdiff
path: root/drivers/char/Kconfig
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-18 14:56:25 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-18 14:56:25 -0700
commitab08ed1770140ebcf1be1657087689832b755874 (patch)
treea74c6eaa042801699d25dbef60c8bea597afdfc2 /drivers/char/Kconfig
parent54e840dd5021ae03c5d2b4158b191bb67f584b75 (diff)
parentb7e04f8c61a46d742de23af5d7ca2b41b33e40ac (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
* git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog: mv watchdog tree under drivers
Diffstat (limited to 'drivers/char/Kconfig')
-rw-r--r--drivers/char/Kconfig2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index 4dbee616eac6..65491103e0fb 100644
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -632,8 +632,6 @@ config HVCS
source "drivers/char/ipmi/Kconfig"
-source "drivers/char/watchdog/Kconfig"
-
config DS1620
tristate "NetWinder thermometer support"
depends on ARCH_NETWINDER