diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2004-12-31 00:16:16 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2004-12-31 00:16:16 +0000 |
| commit | d5b3d08ededfef65456176a8d947b514e1a1e06d (patch) | |
| tree | 92e1c795eba7511e51d7231cdc2b7914c3f35f10 | |
| parent | b290aa8931267373bdf3079d5c63686d3fd84d3c (diff) | |
Move the cfdriver struct to rtw.c where it belongs so cardbus rtw
can be enabled seperately from pci rtw. From fgsch@
| -rw-r--r-- | sys/dev/ic/rtw.c | 6 | ||||
| -rw-r--r-- | sys/dev/pci/if_rtw_pci.c | 5 |
2 files changed, 6 insertions, 5 deletions
diff --git a/sys/dev/ic/rtw.c b/sys/dev/ic/rtw.c index dcd99ae6d3c..5c5202ccb9f 100644 --- a/sys/dev/ic/rtw.c +++ b/sys/dev/ic/rtw.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rtw.c,v 1.1 2004/12/29 01:02:31 jsg Exp $ */ +/* $OpenBSD: rtw.c,v 1.2 2004/12/31 00:16:15 jsg Exp $ */ /* $NetBSD: rtw.c,v 1.29 2004/12/27 19:49:16 dyoung Exp $ */ /*- * Copyright (c) 2004, 2005 David Young. All rights reserved. @@ -192,6 +192,10 @@ void rtw_print_txdesc(struct rtw_softc *, const char *, void rtw_print_regs(struct rtw_regs *, const char *, const char *); #endif +struct cfdriver rtw_cd = { + NULL, "rtw", DV_IFNET +}; + #ifdef RTW_DEBUG void rtw_print_regs(struct rtw_regs *regs, const char *dvname, const char *where) diff --git a/sys/dev/pci/if_rtw_pci.c b/sys/dev/pci/if_rtw_pci.c index b9b09bd9110..16193435482 100644 --- a/sys/dev/pci/if_rtw_pci.c +++ b/sys/dev/pci/if_rtw_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_rtw_pci.c,v 1.1 2004/12/29 01:02:30 jsg Exp $ */ +/* $OpenBSD: if_rtw_pci.c,v 1.2 2004/12/31 00:16:15 jsg Exp $ */ /* $NetBSD: if_rtw_pci.c,v 1.1 2004/09/26 02:33:36 dyoung Exp $ */ /*- @@ -108,9 +108,6 @@ void rtw_pci_attach(struct device *, struct device *, void *); struct cfattach rtw_pci_ca = { sizeof (struct rtw_pci_softc), rtw_pci_match, rtw_pci_attach }; -struct cfdriver rtw_cd = { - 0, "rtw", DV_IFNET -}; const struct rtw_pci_product { u_int32_t app_vendor; /* PCI vendor ID */ |