From: Dave Jones The comment at the top of the Makefile suggests that the current ordering is incorrect. Signed-off-by: Dave Jones Signed-off-by: Andrew Morton --- 25-akpm/drivers/char/watchdog/Makefile | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff -puN drivers/char/watchdog/Makefile~hw-watchdog-vs-softdog-fix drivers/char/watchdog/Makefile --- 25/drivers/char/watchdog/Makefile~hw-watchdog-vs-softdog-fix Mon Mar 7 17:30:21 2005 +++ 25-akpm/drivers/char/watchdog/Makefile Mon Mar 7 17:30:42 2005 @@ -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 @@ -25,7 +20,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 @@ -41,3 +35,10 @@ obj-$(CONFIG_IXP4XX_WATCHDOG) += ixp4xx_ obj-$(CONFIG_IXP2000_WATCHDOG) += ixp2000_wdt.o obj-$(CONFIG_8xx_WDT) += mpc8xx_wdt.o obj-$(CONFIG_MV64X60_WDT) += mv64x60_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 _