diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2004-12-31 04:27:53 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2004-12-31 04:27:53 +0000 |
| commit | c0a51466085c4c6fdd5826b89447d1b7be4c3a85 (patch) | |
| tree | 19e6d82ebcd56b3c215d5babdbd02596f8c34a4c /sys/dev | |
| parent | a0f8a7c8c1d44906df87778f54b3e7322d9c80a1 (diff) | |
Define atw cfdriver struct in atw.c so atw at cardbus does not
depend on atw at pci. ok millert@
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/ic/atw.c | 6 | ||||
| -rw-r--r-- | sys/dev/pci/if_atw_pci.c | 5 |
2 files changed, 6 insertions, 5 deletions
diff --git a/sys/dev/ic/atw.c b/sys/dev/ic/atw.c index 9a8c1f41127..07e5da5f304 100644 --- a/sys/dev/ic/atw.c +++ b/sys/dev/ic/atw.c @@ -1,4 +1,4 @@ -/* $OpenBSD: atw.c,v 1.26 2004/07/25 13:36:08 millert Exp $ */ +/* $OpenBSD: atw.c,v 1.27 2004/12/31 04:27:52 jsg Exp $ */ /* $NetBSD: atw.c,v 1.69 2004/07/23 07:07:55 dyoung Exp $ */ /*- @@ -285,6 +285,10 @@ void atw_si4126_write(struct atw_softc *, u_int, u_int); const struct atw_txthresh_tab atw_txthresh_tab_lo[] = ATW_TXTHRESH_TAB_LO_RATE; const struct atw_txthresh_tab atw_txthresh_tab_hi[] = ATW_TXTHRESH_TAB_HI_RATE; +struct cfdriver atw_cd = { + NULL, "atw", DV_IFNET +}; + const char *atw_tx_state[] = { "STOPPED", "RUNNING - read descriptor", diff --git a/sys/dev/pci/if_atw_pci.c b/sys/dev/pci/if_atw_pci.c index 17caac25d77..f35a00ac227 100644 --- a/sys/dev/pci/if_atw_pci.c +++ b/sys/dev/pci/if_atw_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_atw_pci.c,v 1.3 2004/07/25 13:50:49 millert Exp $ */ +/* $OpenBSD: if_atw_pci.c,v 1.4 2004/12/31 04:27:52 jsg Exp $ */ /* $NetBSD: if_atw_pci.c,v 1.7 2004/07/23 07:07:55 dyoung Exp $ */ /*- @@ -102,9 +102,6 @@ void atw_pci_attach(struct device *, struct device *, void *); struct cfattach atw_pci_ca = { sizeof (struct atw_softc), atw_pci_match, atw_pci_attach }; -struct cfdriver atw_cd = { - 0, "atw", DV_IFNET -}; const struct atw_pci_product { u_int32_t app_vendor; /* PCI vendor ID */ |