diff options
| author | imp <imp@FreeBSD.org> | 2005-10-18 06:09:42 +0000 |
|---|---|---|
| committer | imp <imp@FreeBSD.org> | 2005-10-18 06:09:42 +0000 |
| commit | e4a2a89b0fe921cadf5b798c8a2f10cab992adcb (patch) | |
| tree | 05f37b6fe27af4c88bd30529684aeb91ebbedddf /sys/dev/dc | |
| parent | 1c6388f59d84d44e26ad31d5dc72b9d2d3533c08 (diff) | |
| download | FreeBSD-src-e4a2a89b0fe921cadf5b798c8a2f10cab992adcb.zip FreeBSD-src-e4a2a89b0fe921cadf5b798c8a2f10cab992adcb.tar.gz | |
Make dc compile after repo-copy.
Diffstat (limited to 'sys/dev/dc')
| -rw-r--r-- | sys/dev/dc/dcphy.c | 2 | ||||
| -rw-r--r-- | sys/dev/dc/if_dc.c | 7 | ||||
| -rw-r--r-- | sys/dev/dc/pnphy.c | 2 |
3 files changed, 6 insertions, 5 deletions
diff --git a/sys/dev/dc/dcphy.c b/sys/dev/dc/dcphy.c index f0ef674..e11fa54 100644 --- a/sys/dev/dc/dcphy.c +++ b/sys/dev/dc/dcphy.c @@ -66,7 +66,7 @@ __FBSDID("$FreeBSD$"); #include <dev/pci/pcivar.h> -#include <pci/if_dcreg.h> +#include <dev/dc/if_dcreg.h> #include "miibus_if.h" diff --git a/sys/dev/dc/if_dc.c b/sys/dev/dc/if_dc.c index d4322d5..8742fa4 100644 --- a/sys/dev/dc/if_dc.c +++ b/sys/dev/dc/if_dc.c @@ -132,7 +132,7 @@ __FBSDID("$FreeBSD$"); #define SRM_MEDIA #endif -#include <pci/if_dcreg.h> +#include <dev/dc/if_dcreg.h> #ifdef __sparc64__ #include <dev/ofw/openfirm.h> @@ -2356,8 +2356,6 @@ dc_detach(device_t dev) callout_drain(&sc->dc_stat_ch); ether_ifdetach(ifp); } - if (ifp) - if_free(ifp); if (sc->dc_miibus) device_delete_child(dev, sc->dc_miibus); bus_generic_detach(dev); @@ -2369,6 +2367,9 @@ dc_detach(device_t dev) if (sc->dc_res) bus_release_resource(dev, DC_RES, DC_RID, sc->dc_res); + if (ifp) + if_free(ifp); + if (sc->dc_cdata.dc_sbuf != NULL) bus_dmamem_free(sc->dc_stag, sc->dc_cdata.dc_sbuf, sc->dc_smap); if (sc->dc_ldata != NULL) diff --git a/sys/dev/dc/pnphy.c b/sys/dev/dc/pnphy.c index 573bfb8..a690d60 100644 --- a/sys/dev/dc/pnphy.c +++ b/sys/dev/dc/pnphy.c @@ -62,7 +62,7 @@ __FBSDID("$FreeBSD$"); #include <machine/resource.h> #include <sys/bus.h> -#include <pci/if_dcreg.h> +#include <dev/dc/if_dcreg.h> #include "miibus_if.h" |
