diff options
author | Reyk Floeter <reyk@cvs.openbsd.org> | 2004-11-23 09:39:30 +0000 |
---|---|---|
committer | Reyk Floeter <reyk@cvs.openbsd.org> | 2004-11-23 09:39:30 +0000 |
commit | a7b2471ab522d25c6e01aa1d3ee3b4fedbba8b71 (patch) | |
tree | f23f4e30287ee515d3008e3d6a992c3bce00be80 /sys/dev/cardbus/if_ath_cardbus.c | |
parent | 2a2ef5a2a5fe229808934f80cc470f56d09e1d52 (diff) |
support the gpio found on ath(4) devices.
ok grange@
Diffstat (limited to 'sys/dev/cardbus/if_ath_cardbus.c')
-rw-r--r-- | sys/dev/cardbus/if_ath_cardbus.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/sys/dev/cardbus/if_ath_cardbus.c b/sys/dev/cardbus/if_ath_cardbus.c index c04fbb0dc91..d57184e3c7f 100644 --- a/sys/dev/cardbus/if_ath_cardbus.c +++ b/sys/dev/cardbus/if_ath_cardbus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ath_cardbus.c,v 1.1 2004/11/02 02:45:37 reyk Exp $ */ +/* $OpenBSD: if_ath_cardbus.c,v 1.2 2004/11/23 09:39:29 reyk Exp $ */ /* $NetBSD: if_ath_cardbus.c,v 1.4 2004/08/02 19:14:28 mycroft Exp $ */ /* @@ -49,6 +49,7 @@ #include <sys/ioctl.h> #include <sys/errno.h> #include <sys/device.h> +#include <sys/gpio.h> #include <machine/endian.h> @@ -68,7 +69,6 @@ #include <net/bpf.h> #endif - #ifdef NS #include <netns/ns.h> #include <netns/ns_if.h> @@ -77,10 +77,7 @@ #include <machine/bus.h> #include <machine/intr.h> -#include <dev/mii/miivar.h> -#include <dev/mii/mii_bitbang.h> - -#include <dev/ic/athvar.h> +#include <dev/gpio/gpiovar.h> #include <dev/pci/pcivar.h> #include <dev/pci/pcireg.h> @@ -88,6 +85,8 @@ #include <dev/cardbus/cardbusvar.h> +#include <dev/ic/athvar.h> + /* * PCI configuration space registers */ @@ -211,7 +210,7 @@ ath_cardbus_detach(struct device *self, int flags) panic("%s: data structure lacks", sc->sc_dev.dv_xname); #endif - rv = ath_detach(sc); + rv = ath_detach(sc, flags); if (rv) return (rv); |