From ef27b38592f3ab632e7271afe5ef271057d7cedd Mon Sep 17 00:00:00 2001
From: "Todd C. Miller" <millert@cvs.openbsd.org>
Date: Wed, 28 Jul 2004 13:12:31 +0000
Subject: =?UTF-8?q?3Com=20OfficeConnect=203CRSHPW796=20Cardbus=20card=20is?=
 =?UTF-8?q?=20atw(4)=20rev=201.5.=20Patch=20based=20on=20info=20from=20Sig?=
 =?UTF-8?q?fred=20H=C3=A5versen=20and=20David=20Young.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 share/man/man4/atw.4             | 4 +++-
 sys/dev/cardbus/if_atw_cardbus.c | 5 ++++-
 sys/dev/pci/pcidevs              | 3 ++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/share/man/man4/atw.4 b/share/man/man4/atw.4
index a68e6f9e95a..c7e4963452a 100644
--- a/share/man/man4/atw.4
+++ b/share/man/man4/atw.4
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: atw.4,v 1.4 2004/06/27 19:52:45 millert Exp $
+.\"     $OpenBSD: atw.4,v 1.5 2004/07/28 13:12:30 millert Exp $
 .\"	$NetBSD: atw.4,v 1.8 2004/06/06 04:05:49 wiz Exp $
 .\"
 .\" Copyright (c) 2003
@@ -102,6 +102,8 @@ This includes:
 .Pp
 .Bl -item -offset indent -compact
 .It
+3Com OfficeConnect 3CRSHPW796 Cardbus card
+.It
 Belkin F5D6001 PCI card
 .It
 Blitz NetWave Point Cardbus card
diff --git a/sys/dev/cardbus/if_atw_cardbus.c b/sys/dev/cardbus/if_atw_cardbus.c
index 004760b7f0c..dc34cfbdcda 100644
--- a/sys/dev/cardbus/if_atw_cardbus.c
+++ b/sys/dev/cardbus/if_atw_cardbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_atw_cardbus.c,v 1.4 2004/07/25 13:50:49 millert Exp $	*/
+/*	$OpenBSD: if_atw_cardbus.c,v 1.5 2004/07/28 13:12:29 millert Exp $	*/
 /*	$NetBSD: if_atw_cardbus.c,v 1.9 2004/07/23 07:07:55 dyoung Exp $	*/
 
 /*-
@@ -144,6 +144,9 @@ const struct atw_cardbus_product {
 	{ PCI_VENDOR_ADMTEK,		PCI_PRODUCT_ADMTEK_ADM8211,
 	  "ADMtek ADM8211 802.11 MAC/BBP" },
 
+	{ PCI_VENDOR_3COM,		PCI_PRODUCT_3COM_3CRSHPW796,
+	  "3Com 3CRSHPW796 802.11b" },
+
 	{ 0,				0,	NULL },
 };
 
diff --git a/sys/dev/pci/pcidevs b/sys/dev/pci/pcidevs
index e2da9c9f727..2d13ec6116c 100644
--- a/sys/dev/pci/pcidevs
+++ b/sys/dev/pci/pcidevs
@@ -1,4 +1,4 @@
-$OpenBSD: pcidevs,v 1.752 2004/07/20 05:07:12 david Exp $
+$OpenBSD: pcidevs,v 1.753 2004/07/28 13:12:30 millert Exp $
 /*	$NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ 	*/
 
 /*
@@ -291,6 +291,7 @@ product 3COM 3C595TX		0x5950	3c595 100Base-TX
 product 3COM 3C595T4		0x5951	3c595 100Base-T4
 product 3COM 3C595MII		0x5952	3c595 10Mbps-MII
 product 3COM 3C555		0x5055	3c555 100Base-TX
+product 3COM 3CRSHPW796		0x6000	3CRSHPW796 802.11b
 product 3COM 3C556		0x6055	3c556 100Base-TX
 product 3COM 3C556B		0x6056	3c556B 100Base-TX
 product 3COM 3CSOHO100TX	0x7646	3cSOHO-TX
-- 
cgit v1.2.3