summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2007-11-01 00:51:37 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2007-11-01 00:51:37 +0000
commit0d2b324c4d74e5e4d8806422255e86008253389d (patch)
tree214cd72222c89d73530260a7721a8acc91a38a18
parent10c066c66f9e74f55e629651b9c97a501aa4e199 (diff)
Admtek/Shantou ADM8515; nicm__@ntlworld.com
-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 25f47f40b3c..8f6c42dd3b7 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.36 2007/10/20 01:05:46 beck Exp $ */
+/* $OpenBSD: if_udav.c,v 1.37 2007/11/01 00:51:36 deraadt 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 $ */
/*
@@ -166,7 +166,8 @@ static const struct udav_type {
{{ 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_ZT6688 }, 0 }
+ {{ USB_VENDOR_SHANTOU, USB_PRODUCT_SHANTOU_ZT6688 }, 0 },
+ {{ USB_VENDOR_SHANTOU, USB_PRODUCT_SHANTOU_ADM8515 }, 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 591c640a08d..23cb550ca05 100644
--- a/sys/dev/usb/usbdevs
+++ b/sys/dev/usb/usbdevs
@@ -1,4 +1,4 @@
-$OpenBSD: usbdevs,v 1.306 2007/10/23 17:03:22 mbalmer Exp $
+$OpenBSD: usbdevs,v 1.307 2007/11/01 00:51:36 deraadt Exp $
/* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
/*
@@ -2040,6 +2040,7 @@ product SGI SN1_L1_SC 0x1234 SN1 L1 System Controller
product SHANTOU ST268 0x0268 ST268
product SHANTOU DM9601 0x9601 DM9601
product SHANTOU ZT6688 0x6688 ZT6688
+product SHANTOU ADM8515 0x8515 ADM8515 Ethernet
/* Shark products */
product SHARK PA 0x0400 Pocket Adapter