regen

2 files changed, 30 insertions, 28 deletions

diff --git a/sys/dev/usb/usbdevs.h b/sys/dev/usb/usbdevs.h
index 838a2b2ff53..3af156e3fa1 100644
--- a/sys/dev/usb/usbdevs.h
+++ b/sys/dev/usb/usbdevs.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: usbdevs.h,v 1.166 2005/07/18 14:39:01 jsg Exp $	*/
+/*	$OpenBSD: usbdevs.h,v 1.167 2005/07/19 11:41:33 jsg Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: usbdevs,v 1.162 2005/07/18 14:37:22 jsg Exp 
+ *	OpenBSD: usbdevs,v 1.163 2005/07/19 11:40:44 jsg Exp 
  */
 /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
 
@@ -371,7 +371,7 @@
 #define	USB_VENDOR_ASIX	0x0b95		/* ASIX Electronics */
 #define	USB_VENDOR_USR	0x0baf		/* U.S. Robotics */
 #define	USB_VENDOR_AMBIT	0x0bb2		/* Ambit Microsystems */
-#define	USB_VENDOR_GREENHOUSE2	0x0bda		/* GREENHOUSE */
+#define	USB_VENDOR_REALTEK	0x0bda		/* Realtek */
 #define	USB_VENDOR_ADDONICS2	0x0bf6		/* Addonics Technology */
 #define	USB_VENDOR_AGATE	0x0c08		/* Agate Technologies */
 #define	USB_VENDOR_DMI	0x0c0b		/* DMI */
@@ -960,9 +960,6 @@
 
 /* GREENHOUSE products */
 #define	USB_PRODUCT_GREENHOUSE_KANA21	0x0001		/* CF-writer/MP3 Player */
-#define	USB_PRODUCT_GREENHOUSE2_USBKR100	0x8150		/* GH-USB100B Ethernet */
-#define	USB_PRODUCT_GREENHOUSE2_USBKR100PNA	0x8151		/* GH-USB100B Ethernet PNA */
-#define	USB_PRODUCT_GREENHOUSE2_RTL8187	0x8187		/* RTL8187 */
 
 /* Griffin Technology */
 #define	USB_PRODUCT_GRIFFIN_IMATE	0x0405		/* iMate, ADB adapter */
@@ -1582,6 +1579,11 @@
 /* RATOC Systems products */
 #define	USB_PRODUCT_RATOC_REXUSB60	0xb000		/* USB serial REX-USB60 */
 
+/* Realtek products */
+#define	USB_PRODUCT_REALTEK_RTL8150	0x8150		/* RTL8150 */
+#define	USB_PRODUCT_REALTEK_RTL8151	0x8151		/* RTL8151 PNA */
+#define	USB_PRODUCT_REALTEK_RTL8187	0x8187		/* RTL8187 */
+
 /* Roland products */
 #define	USB_PRODUCT_ROLAND_UA100	0x0000		/* UA-100 Audio I/F */
 #define	USB_PRODUCT_ROLAND_UM4	0x0002		/* UM-4 MIDI I/F */
diff --git a/sys/dev/usb/usbdevs_data.h b/sys/dev/usb/usbdevs_data.h
index e5c938b7ac8..2b91b58be90 100644
--- a/sys/dev/usb/usbdevs_data.h
+++ b/sys/dev/usb/usbdevs_data.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: usbdevs_data.h,v 1.165 2005/07/18 14:39:01 jsg Exp $	*/
+/*	$OpenBSD: usbdevs_data.h,v 1.166 2005/07/19 11:41:33 jsg Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: usbdevs,v 1.162 2005/07/18 14:37:22 jsg Exp 
+ *	OpenBSD: usbdevs,v 1.163 2005/07/19 11:40:44 jsg Exp 
  */
 /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
 
@@ -1871,24 +1871,6 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "CF-writer/MP3 Player",
 	},
 	{
-	    USB_VENDOR_GREENHOUSE2, USB_PRODUCT_GREENHOUSE2_USBKR100,
-	    0,
-	    "GREENHOUSE",
-	    "GH-USB100B Ethernet",
-	},
-	{
-	    USB_VENDOR_GREENHOUSE2, USB_PRODUCT_GREENHOUSE2_USBKR100PNA,
-	    0,
-	    "GREENHOUSE",
-	    "GH-USB100B Ethernet PNA",
-	},
-	{
-	    USB_VENDOR_GREENHOUSE2, USB_PRODUCT_GREENHOUSE2_RTL8187,
-	    0,
-	    "GREENHOUSE",
-	    "RTL8187",
-	},
-	{
 	    USB_VENDOR_GRIFFIN, USB_PRODUCT_GRIFFIN_IMATE,
 	    0,
 	    "Griffin Technology",
@@ -4391,6 +4373,24 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "USB serial REX-USB60",
 	},
 	{
+	    USB_VENDOR_REALTEK, USB_PRODUCT_REALTEK_RTL8150,
+	    0,
+	    "Realtek",
+	    "RTL8150",
+	},
+	{
+	    USB_VENDOR_REALTEK, USB_PRODUCT_REALTEK_RTL8151,
+	    0,
+	    "Realtek",
+	    "RTL8151 PNA",
+	},
+	{
+	    USB_VENDOR_REALTEK, USB_PRODUCT_REALTEK_RTL8187,
+	    0,
+	    "Realtek",
+	    "RTL8187",
+	},
+	{
 	    USB_VENDOR_ROLAND, USB_PRODUCT_ROLAND_UA100,
 	    0,
 	    "Roland",
@@ -7397,9 +7397,9 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
-	    USB_VENDOR_GREENHOUSE2, 0,
+	    USB_VENDOR_REALTEK, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "GREENHOUSE",
+	    "Realtek",
 	    NULL,
 	},
 	{