public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* hw watchdog vs softdog fix.
@ 2005-03-07  6:00 Dave Jones
  0 siblings, 0 replies; only message in thread
From: Dave Jones @ 2005-03-07  6:00 UTC (permalink / raw)
  To: linux-kernel

The comment at the top of the Makefile suggests that the current
ordering is incorrect.

Signed-off-by: Dave Jones <davej@redhat.com>

--- linux-2.6.11/drivers/char/watchdog/Makefile~	2005-03-07 00:57:53.000000000 -0500
+++ linux-2.6.11/drivers/char/watchdog/Makefile	2005-03-07 00:58:18.000000000 -0500
@@ -2,11 +2,6 @@
 # Makefile for the WatchDog device drivers.
 #
 
-# Only one watchdog can succeed. We probe the hardware watchdog
-# drivers first, then the softdog driver.  This means if your hardware
-# watchdog dies or is 'borrowed' for some reason the software watchdog
-# still gives you some cover.
-
 obj-$(CONFIG_PCWATCHDOG) += pcwd.o
 obj-$(CONFIG_ACQUIRE_WDT) += acquirewdt.o
 obj-$(CONFIG_ADVANTECH_WDT) += advantechwdt.o
@@ -24,7 +19,6 @@ obj-$(CONFIG_SH_WDT) += shwdt.o
 obj-$(CONFIG_S3C2410_WATCHDOG) += s3c2410_wdt.o
 obj-$(CONFIG_SA1100_WATCHDOG) += sa1100_wdt.o
 obj-$(CONFIG_EUROTECH_WDT) += eurotechwdt.o
-obj-$(CONFIG_SOFT_WATCHDOG) += softdog.o
 obj-$(CONFIG_W83877F_WDT) += w83877f_wdt.o
 obj-$(CONFIG_W83627HF_WDT) += w83627hf_wdt.o
 obj-$(CONFIG_SC520_WDT) += sc520_wdt.o
@@ -39,3 +33,10 @@ obj-$(CONFIG_USBPCWATCHDOG) += pcwd_usb.
 obj-$(CONFIG_IXP4XX_WATCHDOG) += ixp4xx_wdt.o
 obj-$(CONFIG_IXP2000_WATCHDOG) += ixp2000_wdt.o
 obj-$(CONFIG_8xx_WDT) += mpc8xx_wdt.o
+
+# Only one watchdog can succeed. We probe the hardware watchdog
+# drivers first, then the softdog driver.  This means if your hardware
+# watchdog dies or is 'borrowed' for some reason the software watchdog
+# still gives you some cover.
+
+obj-$(CONFIG_SOFT_WATCHDOG) += softdog.o

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2005-03-07  6:00 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2005-03-07  6:00 hw watchdog vs softdog fix Dave Jones

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox