diff options
| -rw-r--r-- | sys/dev/cardbus/if_fxp_cardbus.c | 4 | ||||
| -rw-r--r-- | sys/dev/cardbus/if_re_cardbus.c | 4 | ||||
| -rw-r--r-- | sys/dev/ic/fxp.c | 4 | ||||
| -rw-r--r-- | sys/dev/ic/fxpvar.h | 4 | ||||
| -rw-r--r-- | sys/dev/ic/re.c | 6 | ||||
| -rw-r--r-- | sys/dev/ic/revar.h | 4 | ||||
| -rw-r--r-- | sys/dev/pci/if_fxp_pci.c | 4 | ||||
| -rw-r--r-- | sys/dev/pci/if_re_pci.c | 4 |
8 files changed, 17 insertions, 17 deletions
diff --git a/sys/dev/cardbus/if_fxp_cardbus.c b/sys/dev/cardbus/if_fxp_cardbus.c index 99e30e25450..432e2072011 100644 --- a/sys/dev/cardbus/if_fxp_cardbus.c +++ b/sys/dev/cardbus/if_fxp_cardbus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_fxp_cardbus.c,v 1.16 2006/06/17 17:58:17 brad Exp $ */ +/* $OpenBSD: if_fxp_cardbus.c,v 1.17 2006/07/01 21:48:08 brad Exp $ */ /* $NetBSD: if_fxp_cardbus.c,v 1.12 2000/05/08 18:23:36 thorpej Exp $ */ /* @@ -191,7 +191,7 @@ fxp_cardbus_attach(struct device *parent, struct device *self, void *aux) sc->sc_revision = PCI_REVISION(ca->ca_class); - fxp_attach_common(sc, intrstr); + fxp_attach(sc, intrstr); } void diff --git a/sys/dev/cardbus/if_re_cardbus.c b/sys/dev/cardbus/if_re_cardbus.c index cc4df0af098..32075884e51 100644 --- a/sys/dev/cardbus/if_re_cardbus.c +++ b/sys/dev/cardbus/if_re_cardbus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_re_cardbus.c,v 1.6 2006/06/24 02:36:15 brad Exp $ */ +/* $OpenBSD: if_re_cardbus.c,v 1.7 2006/07/01 21:48:08 brad Exp $ */ /* * Copyright (c) 2005 Peter Valchev <pvalchev@openbsd.org> @@ -166,7 +166,7 @@ re_cardbus_attach(struct device *parent, struct device *self, void *aux) sc->sc_pwrhook = powerhook_establish(re_cardbus_powerhook, sc); /* Call bus-independent (common) attach routine */ - re_attach_common(sc); + re_attach(sc); } /* diff --git a/sys/dev/ic/fxp.c b/sys/dev/ic/fxp.c index 024d67dd315..be387315bdd 100644 --- a/sys/dev/ic/fxp.c +++ b/sys/dev/ic/fxp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fxp.c,v 1.78 2006/05/22 20:35:12 krw Exp $ */ +/* $OpenBSD: fxp.c,v 1.79 2006/07/01 21:48:08 brad Exp $ */ /* $NetBSD: if_fxp.c,v 1.2 1997/06/05 02:01:55 thorpej Exp $ */ /* @@ -343,7 +343,7 @@ fxp_power(why, arg) * Do generic parts of attach. */ int -fxp_attach_common(sc, intrstr) +fxp_attach(sc, intrstr) struct fxp_softc *sc; const char *intrstr; { diff --git a/sys/dev/ic/fxpvar.h b/sys/dev/ic/fxpvar.h index be847ae97a5..319cee8781c 100644 --- a/sys/dev/ic/fxpvar.h +++ b/sys/dev/ic/fxpvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: fxpvar.h,v 1.24 2006/01/05 21:22:24 brad Exp $ */ +/* $OpenBSD: fxpvar.h,v 1.25 2006/07/01 21:48:08 brad Exp $ */ /* $NetBSD: if_fxpvar.h,v 1.1 1997/06/05 02:01:58 thorpej Exp $ */ /* @@ -160,7 +160,7 @@ struct fxp_softc { bus_space_write_4((sc)->sc_st, (sc)->sc_sh, (reg), (val)) extern int fxp_intr(void *); -extern int fxp_attach_common(struct fxp_softc *, const char *); +extern int fxp_attach(struct fxp_softc *, const char *); extern int fxp_detach(struct fxp_softc *); #define FXP_RXMAP_GET(sc) ((sc)->sc_rxmaps[(sc)->sc_rxfree++]) diff --git a/sys/dev/ic/re.c b/sys/dev/ic/re.c index ed49cd57006..cb86db2b43f 100644 --- a/sys/dev/ic/re.c +++ b/sys/dev/ic/re.c @@ -1,4 +1,4 @@ -/* $OpenBSD: re.c,v 1.32 2006/06/30 06:17:55 brad Exp $ */ +/* $OpenBSD: re.c,v 1.33 2006/07/01 21:48:08 brad Exp $ */ /* $FreeBSD: if_re.c,v 1.31 2004/09/04 07:54:05 ru Exp $ */ /* * Copyright (c) 1997, 1998-2003 @@ -153,7 +153,7 @@ int redebug = 0; #define DPRINTF(x) if (redebug) printf x -void re_attach_common(struct rl_softc *); +void re_attach(struct rl_softc *); int re_encap(struct rl_softc *, struct mbuf *, int *); @@ -819,7 +819,7 @@ re_allocmem(struct rl_softc *sc) * setup and ethernet/BPF attach. */ void -re_attach_common(struct rl_softc *sc) +re_attach(struct rl_softc *sc) { u_char eaddr[ETHER_ADDR_LEN]; u_int16_t as[3]; diff --git a/sys/dev/ic/revar.h b/sys/dev/ic/revar.h index 2071d2af4c7..46b07b12c27 100644 --- a/sys/dev/ic/revar.h +++ b/sys/dev/ic/revar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: revar.h,v 1.1 2005/01/14 01:08:11 pvalchev Exp $ */ +/* $OpenBSD: revar.h,v 1.2 2006/07/01 21:48:08 brad Exp $ */ /* * Copyright (c) 2005 Peter Valchev <pvalchev@openbsd.org> @@ -17,6 +17,6 @@ */ extern int re_intr(void *); -extern void re_attach_common(struct rl_softc *); +extern void re_attach(struct rl_softc *); extern int re_init(struct ifnet *); extern void re_stop(struct rl_softc *); diff --git a/sys/dev/pci/if_fxp_pci.c b/sys/dev/pci/if_fxp_pci.c index 57c9473c0f1..d2348321a36 100644 --- a/sys/dev/pci/if_fxp_pci.c +++ b/sys/dev/pci/if_fxp_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_fxp_pci.c,v 1.47 2006/06/17 18:00:43 brad Exp $ */ +/* $OpenBSD: if_fxp_pci.c,v 1.48 2006/07/01 21:48:08 brad Exp $ */ /* * Copyright (c) 1995, David Greenman @@ -247,7 +247,7 @@ fxp_pci_attach(parent, self, aux) } /* Do generic parts of attach. */ - if (fxp_attach_common(sc, intrstr)) { + if (fxp_attach(sc, intrstr)) { /* Failed! */ pci_intr_disestablish(pc, sc->sc_ih); bus_space_unmap(sc->sc_st, sc->sc_sh, iosize); diff --git a/sys/dev/pci/if_re_pci.c b/sys/dev/pci/if_re_pci.c index 39637a003c8..933837c263f 100644 --- a/sys/dev/pci/if_re_pci.c +++ b/sys/dev/pci/if_re_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_re_pci.c,v 1.14 2006/06/30 16:51:30 deraadt Exp $ */ +/* $OpenBSD: if_re_pci.c,v 1.15 2006/07/01 21:48:08 brad Exp $ */ /* * Copyright (c) 2005 Peter Valchev <pvalchev@openbsd.org> @@ -200,5 +200,5 @@ re_pci_attach(struct device *parent, struct device *self, void *aux) sc->rl_type = RL_8169; /* Call bus-independent attach routine */ - re_attach_common(sc); + re_attach(sc); } |