diff options
| author | phk <phk@FreeBSD.org> | 2002-09-28 21:59:59 +0000 |
|---|---|---|
| committer | phk <phk@FreeBSD.org> | 2002-09-28 21:59:59 +0000 |
| commit | da9ce5cf0cfc862a1d1bca9aff424a82da366913 (patch) | |
| tree | 8942d03c78877a38831b787d5cac77e499d93a02 /sys/dev | |
| parent | 1265230747afae4fc0491f84f359a659544f01a7 (diff) | |
| download | FreeBSD-src-da9ce5cf0cfc862a1d1bca9aff424a82da366913.zip FreeBSD-src-da9ce5cf0cfc862a1d1bca9aff424a82da366913.tar.gz | |
Rename "struct device" to "struct midway_device" to avoid clashing
with newbus.
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/en/midway.c | 2 | ||||
| -rw-r--r-- | sys/dev/en/midwayvar.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sys/dev/en/midway.c b/sys/dev/en/midway.c index 147d3d9..606d971 100644 --- a/sys/dev/en/midway.c +++ b/sys/dev/en/midway.c @@ -927,7 +927,7 @@ struct en_softc *sc; printf(" work for you, you'd better switch to a newer motherboard.\n"); } #endif /* 1 */ - return; + return; } diff --git a/sys/dev/en/midwayvar.h b/sys/dev/en/midwayvar.h index 007b91b..72afdcb 100644 --- a/sys/dev/en/midwayvar.h +++ b/sys/dev/en/midwayvar.h @@ -76,7 +76,7 @@ #define EN_INTR_RET(X) return #define EN_IOCTL_CMDT u_long -struct device { +struct midway_device { char dv_xname[IFNAMSIZ]; }; @@ -90,7 +90,7 @@ struct device { struct en_softc { /* bsd glue */ - struct device sc_dev; /* system device */ + struct midway_device sc_dev; /* system device */ struct ifnet enif; /* network ifnet handle */ /* bus glue */ |
