diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-18 17:56:25 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-18 17:56:25 -0400 |
| commit | ab08ed1770140ebcf1be1657087689832b755874 (patch) | |
| tree | a74c6eaa042801699d25dbef60c8bea597afdfc2 /drivers/char/Kconfig | |
| parent | 54e840dd5021ae03c5d2b4158b191bb67f584b75 (diff) | |
| parent | b7e04f8c61a46d742de23af5d7ca2b41b33e40ac (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/Kconfig | 2 |
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 | |||
| 632 | 632 | ||
| 633 | source "drivers/char/ipmi/Kconfig" | 633 | source "drivers/char/ipmi/Kconfig" |
| 634 | 634 | ||
| 635 | source "drivers/char/watchdog/Kconfig" | ||
| 636 | |||
| 637 | config DS1620 | 635 | config DS1620 |
| 638 | tristate "NetWinder thermometer support" | 636 | tristate "NetWinder thermometer support" |
| 639 | depends on ARCH_NETWINDER | 637 | depends on ARCH_NETWINDER |