summaryrefslogtreecommitdiffstats
path: root/sys/dev/isa
diff options
context:
space:
mode:
Diffstat (limited to 'sys/dev/isa')
-rw-r--r--sys/dev/isa/fins.c4
-rw-r--r--sys/dev/isa/it.c4
-rw-r--r--sys/dev/isa/sch311x.c4
-rw-r--r--sys/dev/isa/viasio.c4
4 files changed, 8 insertions, 8 deletions
diff --git a/sys/dev/isa/fins.c b/sys/dev/isa/fins.c
index bf4ae3d2fc9..af5087fb17e 100644
--- a/sys/dev/isa/fins.c
+++ b/sys/dev/isa/fins.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fins.c,v 1.2 2009/03/30 00:36:26 deraadt Exp $ */
+/* $OpenBSD: fins.c,v 1.3 2012/10/17 22:32:01 deraadt Exp $ */
/*
* Copyright (c) 2005, 2006 Mark Kettenis
@@ -300,7 +300,7 @@ fins_attach(struct device *parent, struct device *self, void *aux)
sc->fins_wdog_cr = fins_read_wdog(sc, FINS_WDOG_CR1);
sc->fins_wdog_cr &= ~(FINS_WDOG_MINS | FINS_WDOG_EN);
fins_write_wdog(sc, FINS_WDOG_CR1, sc->fins_wdog_cr);
- wdog_register(sc, fins_wdog_cb);
+ wdog_register(fins_wdog_cb, sc);
attach_done:
printf("\n");
}
diff --git a/sys/dev/isa/it.c b/sys/dev/isa/it.c
index bed72d7e166..92d34bd3c42 100644
--- a/sys/dev/isa/it.c
+++ b/sys/dev/isa/it.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: it.c,v 1.40 2011/01/20 16:59:55 form Exp $ */
+/* $OpenBSD: it.c,v 1.41 2012/10/17 22:32:01 deraadt Exp $ */
/*
* Copyright (c) 2007-2008 Oleg Safiullin <form@pdp-11.org.ru>
@@ -229,7 +229,7 @@ it_attach(struct device *parent, struct device *self, void *aux)
it_writereg(sc->sc_iot, sc->sc_ioh, IT_LDN, IT_WDT_LDN);
it_writereg(sc->sc_iot, sc->sc_ioh, IT_WDT_CSR, 0x00);
it_writereg(sc->sc_iot, sc->sc_ioh, IT_WDT_TCR, 0x00);
- wdog_register(sc, it_wdog_cb);
+ wdog_register(it_wdog_cb, sc);
}
/* exit MB PnP mode and unmap */
diff --git a/sys/dev/isa/sch311x.c b/sys/dev/isa/sch311x.c
index 64c2f7e0e06..87cd1da851e 100644
--- a/sys/dev/isa/sch311x.c
+++ b/sys/dev/isa/sch311x.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sch311x.c,v 1.12 2009/08/22 03:51:07 mk Exp $ */
+/* $OpenBSD: sch311x.c,v 1.13 2012/10/17 22:32:01 deraadt Exp $ */
/*
* Copyright (c) 2008 Mark Kettenis <kettenis@openbsd.org>
* Copyright (c) 2009 Michael Knudsen <mk@openbsd.org>
@@ -487,7 +487,7 @@ schsio_wdt_init(struct schsio_softc *sc)
reg &= ~(SCHSIO_WDT_CFG_MSEN | SCHSIO_WDT_CFG_MSEN);
bus_space_write_1(sc->sc_iot, sc->sc_ioh_rr, SCHSIO_WDT_CFG, reg);
- wdog_register(sc, schsio_wdt_cb);
+ wdog_register(schsio_wdt_cb, sc);
}
int
diff --git a/sys/dev/isa/viasio.c b/sys/dev/isa/viasio.c
index 08be95cd50e..3b82c46ded5 100644
--- a/sys/dev/isa/viasio.c
+++ b/sys/dev/isa/viasio.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: viasio.c,v 1.12 2009/03/29 21:53:52 sthen Exp $ */
+/* $OpenBSD: viasio.c,v 1.13 2012/10/17 22:32:01 deraadt Exp $ */
/*
* Copyright (c) 2005 Alexander Yurchenko <grange@openbsd.org>
*
@@ -478,7 +478,7 @@ viasio_wdg_init(struct viasio_softc *sc)
}
/* Register new watchdog */
- wdog_register(sc, viasio_wdg_cb);
+ wdog_register(viasio_wdg_cb, sc);
}
int