--- src/sys/dev/netif/an/if_an_pccard.c	2005/06/15 11:35:22	1.10
+++ src/sys/dev/netif/an/if_an_pccard.c	2005/07/27 21:56:32	1.11
@@ -78,14 +78,13 @@
 static int  an_pccard_match(device_t);
 static int  an_pccard_probe(device_t);
 static int  an_pccard_attach(device_t);
-static int  an_pccard_detach(device_t);
 
 static device_method_t an_pccard_methods[] = {
 	/* Device interface */
 	DEVMETHOD(device_probe,		pccard_compat_probe),
 	DEVMETHOD(device_attach,	pccard_compat_attach),
 	DEVMETHOD(device_shutdown,	an_shutdown),
-	DEVMETHOD(device_detach,	an_pccard_detach),
+	DEVMETHOD(device_detach,	an_detach),
 
 	/* Card interface */
 	DEVMETHOD(card_compat_match,	an_pccard_match),
@@ -128,21 +127,6 @@ an_pccard_match(device_t dev)
 }
 
 static int
-an_pccard_detach(device_t dev)
-{
-	struct an_softc		*sc = device_get_softc(dev);
-	struct ifnet		*ifp = &sc->arpcom.ac_if;
-
-	an_stop(sc);
-	ifmedia_removeall(&sc->an_ifmedia);
-	ifp->if_flags &= ~IFF_RUNNING;
-	ether_ifdetach(ifp);
-	bus_teardown_intr(dev, sc->irq_res, sc->irq_handle);
-	an_release_resources(dev);
-	return (0);
-}
-
-static int
 an_pccard_probe(device_t dev)
 {
 	int     error;