summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Gray <jsg@cvs.openbsd.org>2007-09-05 11:09:09 +0000
committerJonathan Gray <jsg@cvs.openbsd.org>2007-09-05 11:09:09 +0000
commite3f9c1cc44b5a471bc1cc7f93c5c1700af3c8dd0 (patch)
tree279b1b8d5a92d0c639ea714675c9848558b467a6
parent4754b6cf7c009bcdcf641a65d7dc4a86d2cdaa3e (diff)
Only match on RTL8185 if RTW_DEBUG is set, support for the RTL8185
was never finished due to a lack of information on the radios. ok reyk@
-rw-r--r--sys/dev/cardbus/if_rtw_cardbus.c6
-rw-r--r--sys/dev/pci/if_rtw_pci.c6
2 files changed, 8 insertions, 4 deletions
diff --git a/sys/dev/cardbus/if_rtw_cardbus.c b/sys/dev/cardbus/if_rtw_cardbus.c
index face717b170..4598f24d5f2 100644
--- a/sys/dev/cardbus/if_rtw_cardbus.c
+++ b/sys/dev/cardbus/if_rtw_cardbus.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_rtw_cardbus.c,v 1.11 2006/10/12 16:35:52 grange Exp $ */
+/* $OpenBSD: if_rtw_cardbus.c,v 1.12 2007/09/05 11:09:08 jsg Exp $ */
/* $NetBSD: if_rtw_cardbus.c,v 1.4 2004/12/20 21:05:34 dyoung Exp $ */
/*-
@@ -161,8 +161,10 @@ void rtw_cardbus_disable(struct rtw_softc *);
void rtw_cardbus_power(struct rtw_softc *, int);
const struct cardbus_matchid rtw_cardbus_devices[] = {
- { PCI_VENDOR_REALTEK, PCI_PRODUCT_REALTEK_RT8185 },
{ PCI_VENDOR_REALTEK, PCI_PRODUCT_REALTEK_RT8180 },
+#ifdef RTW_DEBUG
+ { PCI_VENDOR_REALTEK, PCI_PRODUCT_REALTEK_RT8185 },
+#endif
{ PCI_VENDOR_BELKIN2, PCI_PRODUCT_BELKIN2_F5D6020V3 },
{ PCI_VENDOR_DLINK, PCI_PRODUCT_DLINK_DWL610 },
};
diff --git a/sys/dev/pci/if_rtw_pci.c b/sys/dev/pci/if_rtw_pci.c
index 87e5e7ee638..b1d122db629 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.7 2005/09/08 12:44:55 jsg Exp $ */
+/* $OpenBSD: if_rtw_pci.c,v 1.8 2007/09/05 11:09:08 jsg Exp $ */
/* $NetBSD: if_rtw_pci.c,v 1.1 2004/09/26 02:33:36 dyoung Exp $ */
/*-
@@ -108,8 +108,10 @@ struct cfattach rtw_pci_ca = {
};
const struct pci_matchid rtw_pci_products[] = {
- { PCI_VENDOR_REALTEK, PCI_PRODUCT_REALTEK_RT8185 },
{ PCI_VENDOR_REALTEK, PCI_PRODUCT_REALTEK_RT8180 },
+#ifdef RTW_DEBUG
+ { PCI_VENDOR_REALTEK, PCI_PRODUCT_REALTEK_RT8185 },
+#endif
{ PCI_VENDOR_BELKIN2, PCI_PRODUCT_BELKIN2_F5D6001 },
{ PCI_VENDOR_DLINK, PCI_PRODUCT_DLINK_DWL610 },
};