[WATCHDOG] Kconfig menuconfig patch (261259b2) · Commits · e / devices / android_kernel_sony_msm8994

drivers/char/watchdog/Kconfig

+59 −62

Original line number	Original line	Diff line number	Diff line
	@@ -2,9 +2,7 @@
	# Watchdog device configuration		# Watchdog device configuration
	#		#

	menu "Watchdog Cards"		menuconfig WATCHDOG

	config WATCHDOG
	bool "Watchdog Timer Support"		bool "Watchdog Timer Support"
	---help---		---help---
	If you say Y here (and to one of the following options) and create a		If you say Y here (and to one of the following options) and create a
	@@ -28,9 +26,10 @@ config WATCHDOG

	If unsure, say N.		If unsure, say N.

			if WATCHDOG

	config WATCHDOG_NOWAYOUT		config WATCHDOG_NOWAYOUT
	bool "Disable watchdog shutdown on close"		bool "Disable watchdog shutdown on close"
	depends on WATCHDOG
	help		help
	The default watchdog behaviour (which you get if you say N here) is		The default watchdog behaviour (which you get if you say N here) is
	to stop the timer if the process managing it closes the file		to stop the timer if the process managing it closes the file
	@@ -43,13 +42,11 @@ config WATCHDOG_NOWAYOUT
	#		#

	comment "Watchdog Device Drivers"		comment "Watchdog Device Drivers"
	depends on WATCHDOG

	# Architecture Independent		# Architecture Independent

	config SOFT_WATCHDOG		config SOFT_WATCHDOG
	tristate "Software watchdog"		tristate "Software watchdog"
	depends on WATCHDOG
	help		help
	A software monitoring watchdog. This will fail to reboot your system		A software monitoring watchdog. This will fail to reboot your system
	from some situations that the hardware watchdog will recover		from some situations that the hardware watchdog will recover
	@@ -62,14 +59,14 @@ config SOFT_WATCHDOG

	config AT91RM9200_WATCHDOG		config AT91RM9200_WATCHDOG
	tristate "AT91RM9200 watchdog"		tristate "AT91RM9200 watchdog"
	depends on WATCHDOG && ARCH_AT91RM9200		depends on ARCH_AT91RM9200
	help		help
	Watchdog timer embedded into AT91RM9200 chips. This will reboot your		Watchdog timer embedded into AT91RM9200 chips. This will reboot your
	system when the timeout is reached.		system when the timeout is reached.

	config 21285_WATCHDOG		config 21285_WATCHDOG
	tristate "DC21285 watchdog"		tristate "DC21285 watchdog"
	depends on WATCHDOG && FOOTBRIDGE		depends on FOOTBRIDGE
	help		help
	The Intel Footbridge chip contains a built-in watchdog circuit. Say Y		The Intel Footbridge chip contains a built-in watchdog circuit. Say Y
	here if you wish to use this. Alternatively say M to compile the		here if you wish to use this. Alternatively say M to compile the
	@@ -83,7 +80,7 @@ config 21285_WATCHDOG

	config 977_WATCHDOG		config 977_WATCHDOG
	tristate "NetWinder WB83C977 watchdog"		tristate "NetWinder WB83C977 watchdog"
	depends on WATCHDOG && FOOTBRIDGE && ARCH_NETWINDER		depends on FOOTBRIDGE && ARCH_NETWINDER
	help		help
	Say Y here to include support for the WB977 watchdog included in		Say Y here to include support for the WB977 watchdog included in
	NetWinder machines. Alternatively say M to compile the driver as		NetWinder machines. Alternatively say M to compile the driver as
	@@ -93,7 +90,7 @@ config 977_WATCHDOG

	config IXP2000_WATCHDOG		config IXP2000_WATCHDOG
	tristate "IXP2000 Watchdog"		tristate "IXP2000 Watchdog"
	depends on WATCHDOG && ARCH_IXP2000		depends on ARCH_IXP2000
	help		help
	Say Y here if to include support for the watchdog timer		Say Y here if to include support for the watchdog timer
	in the Intel IXP2000(2400, 2800, 2850) network processors.		in the Intel IXP2000(2400, 2800, 2850) network processors.
	@@ -104,7 +101,7 @@ config IXP2000_WATCHDOG

	config IXP4XX_WATCHDOG		config IXP4XX_WATCHDOG
	tristate "IXP4xx Watchdog"		tristate "IXP4xx Watchdog"
	depends on WATCHDOG && ARCH_IXP4XX		depends on ARCH_IXP4XX
	help		help
	Say Y here if to include support for the watchdog timer		Say Y here if to include support for the watchdog timer
	in the Intel IXP4xx network processors. This driver can		in the Intel IXP4xx network processors. This driver can
	@@ -120,7 +117,7 @@ config IXP4XX_WATCHDOG

	config S3C2410_WATCHDOG		config S3C2410_WATCHDOG
	tristate "S3C2410 Watchdog"		tristate "S3C2410 Watchdog"
	depends on WATCHDOG && ARCH_S3C2410		depends on ARCH_S3C2410
	help		help
	Watchdog timer block in the Samsung S3C2410 chips. This will		Watchdog timer block in the Samsung S3C2410 chips. This will
	reboot the system when the timer expires with the watchdog		reboot the system when the timer expires with the watchdog
	@@ -136,7 +133,7 @@ config S3C2410_WATCHDOG

	config SA1100_WATCHDOG		config SA1100_WATCHDOG
	tristate "SA1100/PXA2xx watchdog"		tristate "SA1100/PXA2xx watchdog"
	depends on WATCHDOG && ( ARCH_SA1100 \|\| ARCH_PXA )		depends on ARCH_SA1100 \|\| ARCH_PXA
	help		help
	Watchdog timer embedded into SA11x0 and PXA2xx chips. This will		Watchdog timer embedded into SA11x0 and PXA2xx chips. This will
	reboot your system when timeout is reached.		reboot your system when timeout is reached.
	@@ -148,7 +145,7 @@ config SA1100_WATCHDOG

	config MPCORE_WATCHDOG		config MPCORE_WATCHDOG
	tristate "MPcore watchdog"		tristate "MPcore watchdog"
	depends on WATCHDOG && ARM_MPCORE_PLATFORM && LOCAL_TIMERS		depends on ARM_MPCORE_PLATFORM && LOCAL_TIMERS
	help		help
	Watchdog timer embedded into the MPcore system.		Watchdog timer embedded into the MPcore system.

	@@ -157,7 +154,7 @@ config MPCORE_WATCHDOG

	config EP93XX_WATCHDOG		config EP93XX_WATCHDOG
	tristate "EP93xx Watchdog"		tristate "EP93xx Watchdog"
	depends on WATCHDOG && ARCH_EP93XX		depends on ARCH_EP93XX
	help		help
	Say Y here if to include support for the watchdog timer		Say Y here if to include support for the watchdog timer
	embedded in the Cirrus Logic EP93xx family of devices.		embedded in the Cirrus Logic EP93xx family of devices.
	@@ -167,14 +164,14 @@ config EP93XX_WATCHDOG

	config OMAP_WATCHDOG		config OMAP_WATCHDOG
	tristate "OMAP Watchdog"		tristate "OMAP Watchdog"
	depends on WATCHDOG && (ARCH_OMAP16XX \|\| ARCH_OMAP24XX)		depends on ARCH_OMAP16XX \|\| ARCH_OMAP24XX
	help		help
	Support for TI OMAP1610/OMAP1710/OMAP2420 watchdog. Say 'Y' here to		Support for TI OMAP1610/OMAP1710/OMAP2420 watchdog. Say 'Y' here to
	enable the OMAP1610/OMAP1710 watchdog timer.		enable the OMAP1610/OMAP1710 watchdog timer.

	config PNX4008_WATCHDOG		config PNX4008_WATCHDOG
	tristate "PNX4008 Watchdog"		tristate "PNX4008 Watchdog"
	depends on WATCHDOG && ARCH_PNX4008		depends on ARCH_PNX4008
	help		help
	Say Y here if to include support for the watchdog timer		Say Y here if to include support for the watchdog timer
	in the PNX4008 processor.		in the PNX4008 processor.
	@@ -187,7 +184,7 @@ config PNX4008_WATCHDOG

	config ACQUIRE_WDT		config ACQUIRE_WDT
	tristate "Acquire SBC Watchdog Timer"		tristate "Acquire SBC Watchdog Timer"
	depends on WATCHDOG && X86		depends on X86
	---help---		---help---
	This is the driver for the hardware watchdog on Single Board		This is the driver for the hardware watchdog on Single Board
	Computers produced by Acquire Inc (and others). This watchdog		Computers produced by Acquire Inc (and others). This watchdog
	@@ -201,7 +198,7 @@ config ACQUIRE_WDT

	config ADVANTECH_WDT		config ADVANTECH_WDT
	tristate "Advantech SBC Watchdog Timer"		tristate "Advantech SBC Watchdog Timer"
	depends on WATCHDOG && X86		depends on X86
	help		help
	If you are configuring a Linux kernel for the Advantech single-board		If you are configuring a Linux kernel for the Advantech single-board
	computer, say `Y' here to support its built-in watchdog timer		computer, say `Y' here to support its built-in watchdog timer
	@@ -210,7 +207,7 @@ config ADVANTECH_WDT

	config ALIM1535_WDT		config ALIM1535_WDT
	tristate "ALi M1535 PMU Watchdog Timer"		tristate "ALi M1535 PMU Watchdog Timer"
	depends on WATCHDOG && X86 && PCI		depends on X86 && PCI
	---help---		---help---
	This is the driver for the hardware watchdog on the ALi M1535 PMU.		This is the driver for the hardware watchdog on the ALi M1535 PMU.

	@@ -221,7 +218,7 @@ config ALIM1535_WDT

	config ALIM7101_WDT		config ALIM7101_WDT
	tristate "ALi M7101 PMU Computer Watchdog"		tristate "ALi M7101 PMU Computer Watchdog"
	depends on WATCHDOG && X86 && PCI		depends on X86 && PCI
	help		help
	This is the driver for the hardware watchdog on the ALi M7101 PMU		This is the driver for the hardware watchdog on the ALi M7101 PMU
	as used in the x86 Cobalt servers.		as used in the x86 Cobalt servers.
	@@ -233,7 +230,7 @@ config ALIM7101_WDT

	config SC520_WDT		config SC520_WDT
	tristate "AMD Elan SC520 processor Watchdog"		tristate "AMD Elan SC520 processor Watchdog"
	depends on WATCHDOG && X86		depends on X86
	help		help
	This is the driver for the hardware watchdog built in to the		This is the driver for the hardware watchdog built in to the
	AMD "Elan" SC520 microcomputer commonly used in embedded systems.		AMD "Elan" SC520 microcomputer commonly used in embedded systems.
	@@ -246,7 +243,7 @@ config SC520_WDT

	config EUROTECH_WDT		config EUROTECH_WDT
	tristate "Eurotech CPU-1220/1410 Watchdog Timer"		tristate "Eurotech CPU-1220/1410 Watchdog Timer"
	depends on WATCHDOG && X86		depends on X86
	help		help
	Enable support for the watchdog timer on the Eurotech CPU-1220 and		Enable support for the watchdog timer on the Eurotech CPU-1220 and
	CPU-1410 cards. These are PC/104 SBCs. Spec sheets and product		CPU-1410 cards. These are PC/104 SBCs. Spec sheets and product
	@@ -254,7 +251,7 @@ config EUROTECH_WDT

	config IB700_WDT		config IB700_WDT
	tristate "IB700 SBC Watchdog Timer"		tristate "IB700 SBC Watchdog Timer"
	depends on WATCHDOG && X86		depends on X86
	---help---		---help---
	This is the driver for the hardware watchdog on the IB700 Single		This is the driver for the hardware watchdog on the IB700 Single
	Board Computer produced by TMC Technology (www.tmc-uk.com). This watchdog		Board Computer produced by TMC Technology (www.tmc-uk.com). This watchdog
	@@ -270,7 +267,7 @@ config IB700_WDT

	config IBMASR		config IBMASR
	tristate "IBM Automatic Server Restart"		tristate "IBM Automatic Server Restart"
	depends on WATCHDOG && X86		depends on X86
	help		help
	This is the driver for the IBM Automatic Server Restart watchdog		This is the driver for the IBM Automatic Server Restart watchdog
	timer built-in into some eServer xSeries machines.		timer built-in into some eServer xSeries machines.
	@@ -280,7 +277,7 @@ config IBMASR

	config WAFER_WDT		config WAFER_WDT
	tristate "ICP Wafer 5823 Single Board Computer Watchdog"		tristate "ICP Wafer 5823 Single Board Computer Watchdog"
	depends on WATCHDOG && X86		depends on X86
	help		help
	This is a driver for the hardware watchdog on the ICP Wafer 5823		This is a driver for the hardware watchdog on the ICP Wafer 5823
	Single Board Computer (and probably other similar models).		Single Board Computer (and probably other similar models).
	@@ -290,7 +287,7 @@ config WAFER_WDT

	config I6300ESB_WDT		config I6300ESB_WDT
	tristate "Intel 6300ESB Timer/Watchdog"		tristate "Intel 6300ESB Timer/Watchdog"
	depends on WATCHDOG && X86 && PCI		depends on X86 && PCI
	---help---		---help---
	Hardware driver for the watchdog timer built into the Intel		Hardware driver for the watchdog timer built into the Intel
	6300ESB controller hub.		6300ESB controller hub.
	@@ -300,7 +297,7 @@ config I6300ESB_WDT

	config ITCO_WDT		config ITCO_WDT
	tristate "Intel TCO Timer/Watchdog"		tristate "Intel TCO Timer/Watchdog"
	depends on WATCHDOG && (X86 \|\| IA64) && PCI		depends on (X86 \|\| IA64) && PCI
	---help---		---help---
	Hardware driver for the intel TCO timer based watchdog devices.		Hardware driver for the intel TCO timer based watchdog devices.
	These drivers are included in the Intel 82801 I/O Controller		These drivers are included in the Intel 82801 I/O Controller
	@@ -329,7 +326,7 @@ config ITCO_VENDOR_SUPPORT

	config SC1200_WDT		config SC1200_WDT
	tristate "National Semiconductor PC87307/PC97307 (ala SC1200) Watchdog"		tristate "National Semiconductor PC87307/PC97307 (ala SC1200) Watchdog"
	depends on WATCHDOG && X86		depends on X86
	help		help
	This is a driver for National Semiconductor PC87307/PC97307 hardware		This is a driver for National Semiconductor PC87307/PC97307 hardware
	watchdog cards as found on the SC1200. This watchdog is mainly used		watchdog cards as found on the SC1200. This watchdog is mainly used
	@@ -343,7 +340,7 @@ config SC1200_WDT

	config SCx200_WDT		config SCx200_WDT
	tristate "National Semiconductor SCx200 Watchdog"		tristate "National Semiconductor SCx200 Watchdog"
	depends on WATCHDOG && SCx200 && PCI		depends on SCx200 && PCI
	help		help
	Enable the built-in watchdog timer support on the National		Enable the built-in watchdog timer support on the National
	Semiconductor SCx200 processors.		Semiconductor SCx200 processors.
	@@ -352,7 +349,7 @@ config SCx200_WDT

	config PC87413_WDT		config PC87413_WDT
	tristate "NS PC87413 watchdog"		tristate "NS PC87413 watchdog"
	depends on WATCHDOG && X86		depends on X86
	---help---		---help---
	This is the driver for the hardware watchdog on the PC87413 chipset		This is the driver for the hardware watchdog on the PC87413 chipset
	This watchdog simply watches your kernel to make sure it doesn't		This watchdog simply watches your kernel to make sure it doesn't
	@@ -366,7 +363,7 @@ config PC87413_WDT

	config 60XX_WDT		config 60XX_WDT
	tristate "SBC-60XX Watchdog Timer"		tristate "SBC-60XX Watchdog Timer"
	depends on WATCHDOG && X86		depends on X86
	help		help
	This driver can be used with the watchdog timer found on some		This driver can be used with the watchdog timer found on some
	single board computers, namely the 6010 PII based computer.		single board computers, namely the 6010 PII based computer.
	@@ -380,7 +377,7 @@ config 60XX_WDT

	config SBC8360_WDT		config SBC8360_WDT
	tristate "SBC8360 Watchdog Timer"		tristate "SBC8360 Watchdog Timer"
	depends on WATCHDOG && X86		depends on X86
	---help---		---help---

	This is the driver for the hardware watchdog on the SBC8360 Single		This is the driver for the hardware watchdog on the SBC8360 Single
	@@ -393,7 +390,7 @@ config SBC8360_WDT

	config CPU5_WDT		config CPU5_WDT
	tristate "SMA CPU5 Watchdog"		tristate "SMA CPU5 Watchdog"
	depends on WATCHDOG && X86		depends on X86
	---help---		---help---
	TBD.		TBD.
	To compile this driver as a module, choose M here: the		To compile this driver as a module, choose M here: the
	@@ -401,7 +398,7 @@ config CPU5_WDT

	config SMSC37B787_WDT		config SMSC37B787_WDT
	tristate "Winbond SMsC37B787 Watchdog Timer"		tristate "Winbond SMsC37B787 Watchdog Timer"
	depends on WATCHDOG && X86		depends on X86
	---help---		---help---
	This is the driver for the hardware watchdog component on the		This is the driver for the hardware watchdog component on the
	Winbond SMsC37B787 chipset as used on the NetRunner Mainboard		Winbond SMsC37B787 chipset as used on the NetRunner Mainboard
	@@ -421,7 +418,7 @@ config SMSC37B787_WDT

	config W83627HF_WDT		config W83627HF_WDT
	tristate "W83627HF Watchdog Timer"		tristate "W83627HF Watchdog Timer"
	depends on WATCHDOG && X86		depends on X86
	---help---		---help---
	This is the driver for the hardware watchdog on the W83627HF chipset		This is the driver for the hardware watchdog on the W83627HF chipset
	as used in Advantech PC-9578 and Tyan S2721-533 motherboards		as used in Advantech PC-9578 and Tyan S2721-533 motherboards
	@@ -436,7 +433,7 @@ config W83627HF_WDT

	config W83697HF_WDT		config W83697HF_WDT
	tristate "W83697HF/W83697HG Watchdog Timer"		tristate "W83697HF/W83697HG Watchdog Timer"
	depends on WATCHDOG && X86		depends on X86
	---help---		---help---
	This is the driver for the hardware watchdog on the W83697HF/HG		This is the driver for the hardware watchdog on the W83697HF/HG
	chipset as used in Dedibox/VIA motherboards (and likely others).		chipset as used in Dedibox/VIA motherboards (and likely others).
	@@ -451,7 +448,7 @@ config W83697HF_WDT

	config W83877F_WDT		config W83877F_WDT
	tristate "W83877F (EMACS) Watchdog Timer"		tristate "W83877F (EMACS) Watchdog Timer"
	depends on WATCHDOG && X86		depends on X86
	---help---		---help---
	This is the driver for the hardware watchdog on the W83877F chipset		This is the driver for the hardware watchdog on the W83877F chipset
	as used in EMACS PC-104 motherboards (and likely others). This		as used in EMACS PC-104 motherboards (and likely others). This
	@@ -466,7 +463,7 @@ config W83877F_WDT

	config W83977F_WDT		config W83977F_WDT
	tristate "W83977F (PCM-5335) Watchdog Timer"		tristate "W83977F (PCM-5335) Watchdog Timer"
	depends on WATCHDOG && X86		depends on X86
	---help---		---help---
	This is the driver for the hardware watchdog on the W83977F I/O chip		This is the driver for the hardware watchdog on the W83977F I/O chip
	as used in AAEON's PCM-5335 SBC (and likely others). This		as used in AAEON's PCM-5335 SBC (and likely others). This
	@@ -479,7 +476,7 @@ config W83977F_WDT

	config MACHZ_WDT		config MACHZ_WDT
	tristate "ZF MachZ Watchdog"		tristate "ZF MachZ Watchdog"
	depends on WATCHDOG && X86		depends on X86
	---help---		---help---
	If you are using a ZF Micro MachZ processor, say Y here, otherwise		If you are using a ZF Micro MachZ processor, say Y here, otherwise
	N. This is the driver for the watchdog timer built-in on that		N. This is the driver for the watchdog timer built-in on that
	@@ -492,7 +489,7 @@ config MACHZ_WDT

	config SBC_EPX_C3_WATCHDOG		config SBC_EPX_C3_WATCHDOG
	tristate "Winsystems SBC EPX-C3 watchdog"		tristate "Winsystems SBC EPX-C3 watchdog"
	depends on WATCHDOG && X86		depends on X86
	---help---		---help---
	This is the driver for the built-in watchdog timer on the EPX-C3		This is the driver for the built-in watchdog timer on the EPX-C3
	Single-board computer made by Winsystems, Inc.		Single-board computer made by Winsystems, Inc.
	@@ -515,19 +512,19 @@ config SBC_EPX_C3_WATCHDOG

	config 8xx_WDT		config 8xx_WDT
	tristate "MPC8xx Watchdog Timer"		tristate "MPC8xx Watchdog Timer"
	depends on WATCHDOG && 8xx		depends on 8xx

	config 83xx_WDT		config 83xx_WDT
	tristate "MPC83xx Watchdog Timer"		tristate "MPC83xx Watchdog Timer"
	depends on WATCHDOG && PPC_83xx		depends on PPC_83xx

	config MV64X60_WDT		config MV64X60_WDT
	tristate "MV64X60 (Marvell Discovery) Watchdog Timer"		tristate "MV64X60 (Marvell Discovery) Watchdog Timer"
	depends on WATCHDOG && MV64X60		depends on MV64X60

	config BOOKE_WDT		config BOOKE_WDT
	bool "PowerPC Book-E Watchdog Timer"		bool "PowerPC Book-E Watchdog Timer"
	depends on WATCHDOG && (BOOKE \|\| 4xx)		depends on BOOKE \|\| 4xx
	---help---		---help---
	Please see Documentation/watchdog/watchdog-api.txt for		Please see Documentation/watchdog/watchdog-api.txt for
	more information.		more information.
	@@ -536,7 +533,7 @@ config BOOKE_WDT

	config WATCHDOG_RTAS		config WATCHDOG_RTAS
	tristate "RTAS watchdog"		tristate "RTAS watchdog"
	depends on WATCHDOG && PPC_RTAS		depends on PPC_RTAS
	help		help
	This driver adds watchdog support for the RTAS watchdog.		This driver adds watchdog support for the RTAS watchdog.

	@@ -547,7 +544,7 @@ config WATCHDOG_RTAS

	config INDYDOG		config INDYDOG
	tristate "Indy/I2 Hardware Watchdog"		tristate "Indy/I2 Hardware Watchdog"
	depends on WATCHDOG && SGI_IP22		depends on SGI_IP22
	help		help
	Hardware driver for the Indy's/I2's watchdog. This is a		Hardware driver for the Indy's/I2's watchdog. This is a
	watchdog timer that will reboot the machine after a 60 second		watchdog timer that will reboot the machine after a 60 second
	@@ -556,7 +553,7 @@ config INDYDOG

	config WDT_RM9K_GPI		config WDT_RM9K_GPI
	tristate "RM9000/GPI hardware watchdog"		tristate "RM9000/GPI hardware watchdog"
	depends on WATCHDOG && CPU_RM9000		depends on CPU_RM9000
	help		help
	Watchdog implementation using the GPI hardware found on		Watchdog implementation using the GPI hardware found on
	PMC-Sierra RM9xxx CPUs.		PMC-Sierra RM9xxx CPUs.
	@@ -568,7 +565,7 @@ config WDT_RM9K_GPI

	config ZVM_WATCHDOG		config ZVM_WATCHDOG
	tristate "z/VM Watchdog Timer"		tristate "z/VM Watchdog Timer"
	depends on WATCHDOG && S390		depends on S390
	help		help
	IBM s/390 and zSeries machines running under z/VM 5.1 or later		IBM s/390 and zSeries machines running under z/VM 5.1 or later
	provide a virtual watchdog timer to their guest that cause a		provide a virtual watchdog timer to their guest that cause a
	@@ -582,7 +579,7 @@ config ZVM_WATCHDOG

	config SH_WDT		config SH_WDT
	tristate "SuperH Watchdog"		tristate "SuperH Watchdog"
	depends on WATCHDOG && SUPERH		depends on SUPERH
	help		help
	This driver adds watchdog support for the integrated watchdog in the		This driver adds watchdog support for the integrated watchdog in the
	SuperH processors. If you have one of these processors and wish		SuperH processors. If you have one of these processors and wish
	@@ -609,7 +606,7 @@ config SH_WDT_MMAP

	config WATCHDOG_CP1XXX		config WATCHDOG_CP1XXX
	tristate "CP1XXX Hardware Watchdog support"		tristate "CP1XXX Hardware Watchdog support"
	depends on WATCHDOG && SPARC64 && PCI		depends on SPARC64 && PCI
	---help---		---help---
	This is the driver for the hardware watchdog timers present on		This is the driver for the hardware watchdog timers present on
	Sun Microsystems CompactPCI models CP1400 and CP1500.		Sun Microsystems CompactPCI models CP1400 and CP1500.
	@@ -623,7 +620,7 @@ config WATCHDOG_CP1XXX

	config WATCHDOG_RIO		config WATCHDOG_RIO
	tristate "RIO Hardware Watchdog support"		tristate "RIO Hardware Watchdog support"
	depends on WATCHDOG && SPARC64 && PCI		depends on SPARC64 && PCI
	help		help
	Say Y here to support the hardware watchdog capability on Sun RIO		Say Y here to support the hardware watchdog capability on Sun RIO
	machines. The watchdog timeout period is normally one minute but		machines. The watchdog timeout period is normally one minute but
	@@ -634,11 +631,11 @@ config WATCHDOG_RIO
	#		#

	comment "ISA-based Watchdog Cards"		comment "ISA-based Watchdog Cards"
	depends on WATCHDOG && ISA		depends on ISA

	config PCWATCHDOG		config PCWATCHDOG
	tristate "Berkshire Products ISA-PC Watchdog"		tristate "Berkshire Products ISA-PC Watchdog"
	depends on WATCHDOG && ISA		depends on ISA
	---help---		---help---
	This is the driver for the Berkshire Products ISA-PC Watchdog card.		This is the driver for the Berkshire Products ISA-PC Watchdog card.
	This card simply watches your kernel to make sure it doesn't freeze,		This card simply watches your kernel to make sure it doesn't freeze,
	@@ -654,7 +651,7 @@ config PCWATCHDOG

	config MIXCOMWD		config MIXCOMWD
	tristate "Mixcom Watchdog"		tristate "Mixcom Watchdog"
	depends on WATCHDOG && ISA		depends on ISA
	---help---		---help---
	This is a driver for the Mixcom hardware watchdog cards. This		This is a driver for the Mixcom hardware watchdog cards. This
	watchdog simply watches your kernel to make sure it doesn't freeze,		watchdog simply watches your kernel to make sure it doesn't freeze,
	@@ -668,7 +665,7 @@ config MIXCOMWD

	config WDT		config WDT
	tristate "WDT Watchdog timer"		tristate "WDT Watchdog timer"
	depends on WATCHDOG && ISA		depends on ISA
	---help---		---help---
	If you have a WDT500P or WDT501P watchdog board, say Y here,		If you have a WDT500P or WDT501P watchdog board, say Y here,
	otherwise N. It is not possible to probe for this board, which means		otherwise N. It is not possible to probe for this board, which means
	@@ -698,11 +695,11 @@ config WDT_501
	#		#

	comment "PCI-based Watchdog Cards"		comment "PCI-based Watchdog Cards"
	depends on WATCHDOG && PCI		depends on PCI

	config PCIPCWATCHDOG		config PCIPCWATCHDOG
	tristate "Berkshire Products PCI-PC Watchdog"		tristate "Berkshire Products PCI-PC Watchdog"
	depends on WATCHDOG && PCI		depends on PCI
	---help---		---help---
	This is the driver for the Berkshire Products PCI-PC Watchdog card.		This is the driver for the Berkshire Products PCI-PC Watchdog card.
	This card simply watches your kernel to make sure it doesn't freeze,		This card simply watches your kernel to make sure it doesn't freeze,
	@@ -717,7 +714,7 @@ config PCIPCWATCHDOG

	config WDTPCI		config WDTPCI
	tristate "PCI-WDT500/501 Watchdog timer"		tristate "PCI-WDT500/501 Watchdog timer"
	depends on WATCHDOG && PCI		depends on PCI
	---help---		---help---
	If you have a PCI-WDT500/501 watchdog board, say Y here, otherwise N.		If you have a PCI-WDT500/501 watchdog board, say Y here, otherwise N.

	@@ -744,11 +741,11 @@ config WDT_501_PCI
	#		#

	comment "USB-based Watchdog Cards"		comment "USB-based Watchdog Cards"
	depends on WATCHDOG && USB		depends on USB

	config USBPCWATCHDOG		config USBPCWATCHDOG
	tristate "Berkshire Products USB-PC Watchdog"		tristate "Berkshire Products USB-PC Watchdog"
	depends on WATCHDOG && USB		depends on USB
	---help---		---help---
	This is the driver for the Berkshire Products USB-PC Watchdog card.		This is the driver for the Berkshire Products USB-PC Watchdog card.
	This card simply watches your kernel to make sure it doesn't freeze,		This card simply watches your kernel to make sure it doesn't freeze,
	@@ -761,4 +758,4 @@ config USBPCWATCHDOG

	Most people will say N.		Most people will say N.

	endmenu		endif # WATCHDOG