Commit 4fe83d38 authored by Greg Banks's avatar Greg Banks Committed by Linus Torvalds

[PATCH] PATCH 2.5: kconfig synchronise banners (15_16)

2/4 definitions of CONFIG_SOFT_WATCHDOG have trivially different banners.
parent 9bc3e3dc
...@@ -501,7 +501,7 @@ bool 'Support for user serial device modules' CONFIG_USERIAL ...@@ -501,7 +501,7 @@ bool 'Support for user serial device modules' CONFIG_USERIAL
bool 'Watchdog Timer Support' CONFIG_WATCHDOG bool 'Watchdog Timer Support' CONFIG_WATCHDOG
if [ "$CONFIG_WATCHDOG" != "n" ]; then if [ "$CONFIG_WATCHDOG" != "n" ]; then
bool ' Disable watchdog shutdown on close' CONFIG_WATCHDOG_NOWAYOUT bool ' Disable watchdog shutdown on close' CONFIG_WATCHDOG_NOWAYOUT
bool ' Software Watchdog' CONFIG_SOFT_WATCHDOG bool ' Software watchdog' CONFIG_SOFT_WATCHDOG
fi fi
if [ "$CONFIG_ATARI" = "y" ]; then if [ "$CONFIG_ATARI" = "y" ]; then
bool 'Enhanced Real Time Clock Support' CONFIG_RTC bool 'Enhanced Real Time Clock Support' CONFIG_RTC
......
...@@ -148,7 +148,7 @@ comment 'Watchdog Cards' ...@@ -148,7 +148,7 @@ comment 'Watchdog Cards'
bool 'Watchdog Timer Support' CONFIG_WATCHDOG bool 'Watchdog Timer Support' CONFIG_WATCHDOG
if [ "$CONFIG_WATCHDOG" != "n" ]; then if [ "$CONFIG_WATCHDOG" != "n" ]; then
bool ' Disable watchdog shutdown on close' CONFIG_WATCHDOG_NOWAYOUT bool ' Disable watchdog shutdown on close' CONFIG_WATCHDOG_NOWAYOUT
tristate ' Software Watchdog' CONFIG_SOFT_WATCHDOG tristate ' Software watchdog' CONFIG_SOFT_WATCHDOG
tristate ' WDT Watchdog timer' CONFIG_WDT tristate ' WDT Watchdog timer' CONFIG_WDT
tristate ' WDT PCI Watchdog timer' CONFIG_WDTPCI tristate ' WDT PCI Watchdog timer' CONFIG_WDTPCI
if [ "$CONFIG_WDT" != "n" ]; then if [ "$CONFIG_WDT" != "n" ]; then
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment