Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ca412cc9 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge gregkh@master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog

parents e0e92632 2621e2a1

drivers/char/watchdog/Kconfig

+4 −4
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ config WATCHDOG_NOWAYOUT 
comment "Watchdog Device Drivers"

	depends on WATCHDOG



# Architecture Independant

# Architecture Independent



config SOFT_WATCHDOG

	tristate "Software watchdog"
@@ -127,7 +127,7 @@ config S3C2410_WATCHDOG 
	  enabled.



	  The driver is limited by the speed of the system's PCLK

	  signal, so with reasonbaly fast systems (PCLK around 50-66MHz)

	  signal, so with reasonably fast systems (PCLK around 50-66MHz)

	  then watchdog intervals of over approximately 20seconds are

	  unavailable.
@@ -423,7 +423,7 @@ config SBC_EPX_C3_WATCHDOG 
	  is no way to know if writing to its IO address will corrupt

	  your system or have any real effect.  The only way to be sure

	  that this driver does what you want is to make sure you

	  are runnning it on an EPX-C3 from Winsystems with the watchdog

	  are running it on an EPX-C3 from Winsystems with the watchdog

	  timer at IO address 0x1ee and 0x1ef.  It will write to both those

	  IO ports.  Basically, the assumption is made that if you compile

	  this driver into your kernel and/or load it as a module, that you