patch-2.4.20 linux-2.4.20/drivers/char/sbc60xxwdt.c
Next file: linux-2.4.20/drivers/char/sc1200wdt.c
Previous file: linux-2.4.20/drivers/char/rio/riocmd.c
Back to the patch index
Back to the overall index
- Lines: 29
- Date:
Thu Nov 28 15:53:12 2002
- Orig file:
linux-2.4.19/drivers/char/sbc60xxwdt.c
- Orig date:
Thu Sep 13 15:21:32 2001
diff -urN linux-2.4.19/drivers/char/sbc60xxwdt.c linux-2.4.20/drivers/char/sbc60xxwdt.c
@@ -234,7 +234,7 @@
{
static struct watchdog_info ident=
{
- 0,
+ WDIOF_MAGICCLOSE,
1,
"SB60xx"
};
@@ -300,15 +300,16 @@
unregister_reboot_notifier(&wdt_notifier);
release_region(WDT_START,1);
- release_region(WDT_STOP,1);
+// release_region(WDT_STOP,1);
}
static int __init sbc60xxwdt_init(void)
{
int rc = -EBUSY;
- if (!request_region(WDT_STOP, 1, "SBC 60XX WDT"))
- goto err_out;
+// We cannot reserve 0x45 - the kernel already has!
+// if (!request_region(WDT_STOP, 1, "SBC 60XX WDT"))
+// goto err_out;
if (!request_region(WDT_START, 1, "SBC 60XX WDT"))
goto err_out_region1;
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)