diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2016-08-16 20:19:05 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2016-08-16 20:19:05 +0000 |
| commit | 27067774dce3388702a4cf744d7096c6fb71b688 (patch) | |
| tree | 56300949abd050b3cd2e23d29210d2a567bc8aec /sys/mips/rmi/dev/nlge | |
| parent | 44be0a8ea517cbe7a9140bca20e1e93228ac0a04 (diff) | |
| parent | 915a263ea24ab051bb57674a4d6f5ffe4ef0d5b5 (diff) | |
Merge ^/head r303250 through r304235.
Notes
Notes:
svn path=/projects/clang390-import/; revision=304236
Diffstat (limited to 'sys/mips/rmi/dev/nlge')
| -rw-r--r-- | sys/mips/rmi/dev/nlge/if_nlge.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/mips/rmi/dev/nlge/if_nlge.c b/sys/mips/rmi/dev/nlge/if_nlge.c index ff4810c9a434..5bdeb2e5dbe3 100644 --- a/sys/mips/rmi/dev/nlge/if_nlge.c +++ b/sys/mips/rmi/dev/nlge/if_nlge.c @@ -140,8 +140,8 @@ static int nlge_ioctl(struct ifnet *, u_long, caddr_t); static int nlge_tx(struct ifnet *ifp, struct mbuf *m); static void nlge_rx(struct nlge_softc *sc, vm_paddr_t paddr, int len); -static int nlge_mii_write(struct device *, int, int, int); -static int nlge_mii_read(struct device *, int, int); +static int nlge_mii_write(device_t, int, int, int); +static int nlge_mii_read(device_t, int, int); static void nlge_mac_mii_statchg(device_t); static int nlge_mediachange(struct ifnet *ifp); static void nlge_mediastatus(struct ifnet *ifp, struct ifmediareq *ifmr); @@ -831,7 +831,7 @@ nlge_rx(struct nlge_softc *sc, vm_paddr_t paddr, int len) } static int -nlge_mii_write(struct device *dev, int phyaddr, int regidx, int regval) +nlge_mii_write(device_t dev, int phyaddr, int regidx, int regval) { struct nlge_softc *sc; @@ -843,7 +843,7 @@ nlge_mii_write(struct device *dev, int phyaddr, int regidx, int regval) } static int -nlge_mii_read(struct device *dev, int phyaddr, int regidx) +nlge_mii_read(device_t dev, int phyaddr, int regidx) { struct nlge_softc *sc; int val; |