From 4fe83d38ed87284f0c1a88571a12f5e8cabee15f Mon Sep 17 00:00:00 2001 From: Greg Banks Date: Wed, 19 Jun 2002 23:48:02 -0700 Subject: [PATCH] [PATCH] PATCH 2.5: kconfig synchronise banners (15_16) 2/4 definitions of CONFIG_SOFT_WATCHDOG have trivially different banners. --- arch/m68k/config.in | 2 +- drivers/char/Config.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/m68k/config.in b/arch/m68k/config.in index fdc56a215e84..047d50e1f4f3 100644 --- a/arch/m68k/config.in +++ b/arch/m68k/config.in @@ -501,7 +501,7 @@ bool 'Support for user serial device modules' CONFIG_USERIAL bool 'Watchdog Timer Support' CONFIG_WATCHDOG if [ "$CONFIG_WATCHDOG" != "n" ]; then bool ' Disable watchdog shutdown on close' CONFIG_WATCHDOG_NOWAYOUT - bool ' Software Watchdog' CONFIG_SOFT_WATCHDOG + bool ' Software watchdog' CONFIG_SOFT_WATCHDOG fi if [ "$CONFIG_ATARI" = "y" ]; then bool 'Enhanced Real Time Clock Support' CONFIG_RTC diff --git a/drivers/char/Config.in b/drivers/char/Config.in index cd5575247bc0..8718e6eb1b03 100644 --- a/drivers/char/Config.in +++ b/drivers/char/Config.in @@ -148,7 +148,7 @@ comment 'Watchdog Cards' bool 'Watchdog Timer Support' CONFIG_WATCHDOG if [ "$CONFIG_WATCHDOG" != "n" ]; then 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 PCI Watchdog timer' CONFIG_WDTPCI if [ "$CONFIG_WDT" != "n" ]; then -- 2.39.5