summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorBob Beck <beck@cvs.openbsd.org>2007-10-20 01:05:48 +0000
committerBob Beck <beck@cvs.openbsd.org>2007-10-20 01:05:48 +0000
commitec06cdc6eea19501df87b0e38f132dfa04a12c19 (patch)
treef73db6e42650778aaf3fb783f14b604dc59adb0b /sys/dev
parentfa538146d2d5817511721581c0fdbde354ac9cbb (diff)
Add ShanTou ZT6688 usb 10/000 nic - A udav sold in a generic package.
ok jsg@, krw@, deraadt@
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/usb/if_udav.c5
-rw-r--r--sys/dev/usb/usbdevs3
2 files changed, 5 insertions, 3 deletions
diff --git a/sys/dev/usb/if_udav.c b/sys/dev/usb/if_udav.c
index fc14f89137c..25f47f40b3c 100644
--- a/sys/dev/usb/if_udav.c
+++ b/sys/dev/usb/if_udav.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_udav.c,v 1.35 2007/10/11 18:33:14 deraadt Exp $ */
+/* $OpenBSD: if_udav.c,v 1.36 2007/10/20 01:05:46 beck Exp $ */
/* $NetBSD: if_udav.c,v 1.3 2004/04/23 17:25:25 itojun Exp $ */
/* $nabe: if_udav.c,v 1.3 2003/08/21 16:57:19 nabe Exp $ */
/*
@@ -165,7 +165,8 @@ static const struct udav_type {
{{ USB_VENDOR_DAVICOM, USB_PRODUCT_DAVICOM_DM9601 }, 0 },
{{ USB_VENDOR_DAVICOM, USB_PRODUCT_DAVICOM_WK668 }, 0 },
{{ USB_VENDOR_SHANTOU, USB_PRODUCT_SHANTOU_DM9601 }, 0 },
- {{ USB_VENDOR_SHANTOU, USB_PRODUCT_SHANTOU_ST268 }, 0 }
+ {{ USB_VENDOR_SHANTOU, USB_PRODUCT_SHANTOU_ST268 }, 0 },
+ {{ USB_VENDOR_SHANTOU, USB_PRODUCT_SHANTOU_ZT6688 }, 0 }
};
#define udav_lookup(v, p) ((struct udav_type *)usb_lookup(udav_devs, v, p))
diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs
index 508d3d123d4..1f402fcd1bf 100644
--- a/sys/dev/usb/usbdevs
+++ b/sys/dev/usb/usbdevs
@@ -1,4 +1,4 @@
-$OpenBSD: usbdevs,v 1.302 2007/10/14 08:29:17 fkr Exp $
+$OpenBSD: usbdevs,v 1.303 2007/10/20 01:05:46 beck Exp $
/* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
/*
@@ -2030,6 +2030,7 @@ product SGI SN1_L1_SC 0x1234 SN1 L1 System Controller
/* ShanTou products */
product SHANTOU ST268 0x0268 ST268
product SHANTOU DM9601 0x9601 DM9601
+product SHANTOU ZT6688 0x6688 ZT6688
/* Shark products */
product SHARK PA 0x0400 Pocket Adapter