Regen.

2 files changed, 204 insertions, 8 deletions

diff --git a/sys/dev/usb/usbdevs.h b/sys/dev/usb/usbdevs.h
index 8671b5f..56781ee 100644
--- a/sys/dev/usb/usbdevs.h
+++ b/sys/dev/usb/usbdevs.h
@@ -4,7 +4,7 @@
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	FreeBSD: src/sys/dev/usb/usbdevs,v 1.50 2001/03/29 00:05:51 peter Exp 
+ *	FreeBSD: src/sys/dev/usb/usbdevs,v 1.51 2001/04/02 13:02:17 n_hibma Exp 
  */
 
 /*
@@ -56,10 +56,10 @@
  *
  * After adding a vendor ID VNDR and a product ID PRDCT you will have the
  * following extra defines:
- * #define USB_VENDOR_VNDR		0x????
- * #define USB_PRODUCT_VNDR_PRDCT	0x????
+ * #define USB_VENDOR_VNDR              0x????
+ * #define USB_PRODUCT_VNDR_PRDCT       0x????
  *
- * You will have to add these defines to the respective probe routines to
+ * You may have to add these defines to the respective probe routines to
  * make the device recognised by the appropriate device driver.
  */
 
@@ -127,6 +127,7 @@
 #define	USB_VENDOR_DIGI2	0x04d0		/* Digi International */
 #define	USB_VENDOR_ITTCANON	0x04d1		/* ITT Canon */
 #define	USB_VENDOR_ALTEC	0x04d2		/* Altec Lansing Technologies, Inc. */
+#define	USB_VENDOR_PANASONIC	0x04da		/* Panasonic (Matsushita) */
 #define	USB_VENDOR_SHUTTLE	0x04e6		/* Shuttle Technology */
 #define	USB_VENDOR_ANNABOOKS	0x04ed		/* Annabooks */
 #define	USB_VENDOR_CHICONY	0x04f2		/* Chicony Electronics Co., Ltd. */
@@ -157,6 +158,7 @@
 #define	USB_VENDOR_ETEK	0x056c		/* e-TEK Labs */
 #define	USB_VENDOR_EIZO	0x056d		/* EIZO */
 #define	USB_VENDOR_ELECOM	0x056e		/* Elecom Corp. Ltd. */
+#define	USB_VENDOR_HAUPPAUGE	0x0573		/* Hauppauge Computer Works */
 #define	USB_VENDOR_BAFO	0x0576		/* BAFO/Quality Computer Accessories */
 #define	USB_VENDOR_YEDATA	0x057b		/* Y-E Data */
 #define	USB_VENDOR_AVM	0x057c		/* AVM GmbH */
@@ -211,6 +213,7 @@
 #define	USB_VENDOR_AGFA	0x06bd		/* AGFA-Gevaert NV */
 #define	USB_VENDOR_ASIAMD	0x06be		/* Asia Microelectronic Development, Inc. */
 #define	USB_VENDOR_BIZLINK	0x06c4		/* Bizlink International Corp. */
+#define	USB_VENDOR_KEYSPAN	0x06cd		/* Keyspan */
 #define	USB_VENDOR_AASHIMA	0x06d6		/* Aashima Technology B.V. */
 #define	USB_VENDOR_MULTITECH	0x06e0		/* MultiTech */
 #define	USB_VENDOR_ADS	0x06e1		/* ADS Technologies, Inc. */
@@ -241,6 +244,7 @@
 #define	USB_VENDOR_ALLIEDTELESYN	0x07c9		/* Allied Telesyn International */
 #define	USB_VENDOR_AVERMEDIA	0x07ca		/* AVerMedia Technologies, Inc. */
 #define	USB_VENDOR_SIIG	0x07cc		/* SIIG */
+#define	USB_VENDOR_CASIO	0x07cf		/* CASIO */
 #define	USB_VENDOR_APTIO	0x07d2		/* Aptio Products, Inc. */
 #define	USB_VENDOR_ARASAN	0x07da		/* Arasan Chip Systems */
 #define	USB_VENDOR_ALLIEDCABLE	0x07e6		/* Allied Cable Corp. */
@@ -265,6 +269,7 @@
 #define	USB_VENDOR_SMARTBRIDGES	0x08d1		/* SmartBridges Pte Ltd. */
 #define	USB_VENDOR_BILLIONTON	0x08dd		/* Billionton Systems, Inc. */
 #define	USB_VENDOR_EXTENDED	0x08e9		/* Extended Systems, Inc. */
+#define	USB_VENDOR_MSYSTEMS	0x08ec		/* M-Systems */
 #define	USB_VENDOR_AUTHENTEC	0x08ff		/* AuthenTec, Inc. */
 #define	USB_VENDOR_ALATION	0x0910		/* Alation Systems, Inc. */
 #define	USB_VENDOR_BIOMETRIC	0x0929		/* American Biometric Company */
@@ -289,6 +294,7 @@
 #define	USB_VENDOR_ASAHIOPTICAL	0x0a17		/* Asahi Optical Co., Ltd. */
 #define	USB_VENDOR_BOCASYSTEMS	0x0a43		/* Boca Systems, Inc. */
 #define	USB_VENDOR_BROADCOM	0x0a5c		/* Broadcom Corp. */
+#define	USB_VENDOR_GREENHOUSE	0x0a6b		/* GREENHOUSE Co., Ltd. */
 #define	USB_VENDOR_GEOCAST	0x0a79		/* Geocast Network Systems */
 #define	USB_VENDOR_MOTOROLA	0x1063		/* Motorola */
 #define	USB_VENDOR_PLX	0x10b5		/* PLX */
@@ -380,6 +386,7 @@
 
 /* Atmel Comp. products */
 #define	USB_PRODUCT_ATMEL_UHB124	0x3301		/* UHB124 hub */
+#define	USB_PRODUCT_ATMEL_DWL120	0x7602		/* DWL-120 Wireless adapter */
 
 /* Avision products */
 #define	USB_PRODUCT_AVISION_1200U	0x0268		/* 1200U scanner */
@@ -399,6 +406,7 @@
 
 /* Canon, Inc. products */
 #define	USB_PRODUCT_CANON_S10	0x3041		/* PowerShot S10 */
+#define	USB_PRODUCT_CANON_N656U	0x2206		/* CANOSCAN N656U */
 
 /* CATC products */
 #define	USB_PRODUCT_CATC_NETMATE	0x000a		/* Netmate ethernet adapter */
@@ -406,6 +414,9 @@
 #define	USB_PRODUCT_CATC_CHIEF	0x000d		/* USB Chief Bus & Protocol Analyzer */
 #define	USB_PRODUCT_CATC_ANDROMEDA	0x1237		/* Andromeda hub */
 
+/* CASIO products */
+#define	USB_PRODUCT_CASIO_NAMELAND	0x4001		/* CASIO Nameland EZ-USB */
+
 /* Cherry products */
 #define	USB_PRODUCT_CHERRY_MY3000KBD	0x0001		/* My3000 keyboard */
 #define	USB_PRODUCT_CHERRY_MY3000HUB	0x0003		/* My3000 hub */
@@ -490,6 +501,7 @@
 #define	USB_PRODUCT_EPSON_1240	0x010b		/* Perfection 1240U / 1240Photo scanner */
 #define	USB_PRODUCT_EPSON_1600	0x0107		/* Expression 1600 scanner */
 #define	USB_PRODUCT_EPSON_1640	0x010a		/* Perfection 1640SU scanner */
+#define	USB_PRODUCT_EPSON_1240	0x010b		/* Perfection 1240U / 1240Photo scanner */
 
 /* e-TEK Labs products */
 #define	USB_PRODUCT_ETEK_1COM	0x8007		/* Serial port */
@@ -500,6 +512,9 @@
 /* Gravis products */
 #define	USB_PRODUCT_GRAVIS_GAMEPADPRO	0x4001		/* GamePad Pro */
 
+/* GREENHOUSE products */
+#define	USB_PRODUCT_GREENHOUSE_KANA21	0x0001		/* CF-writer with Portable MP3 Player */
+
 /* Griffin Technology */
 #define	USB_PRODUCT_GRIFFIN_IMATE	0x0405		/* iMate, ADB adapter */
 
@@ -515,6 +530,9 @@
 /* Handspring, Inc. */
 #define	USB_PRODUCT_HANDSPRING_VISOR	0x0100		/* Handspring Visor */
 
+/* Hauppauge Computer Works */
+#define	USB_PRODUCT_HAUPPAUGE_WINTV_USB_FM	0x4d12		/* WinTV USB FM */
+
 /* HP products */
 #define	USB_PRODUCT_HP_4100C	0x0101		/* Scanjet 4100C */
 #define	USB_PRODUCT_HP_S20	0x0102		/* Photosmart S20 */
@@ -572,6 +590,14 @@
 #define	USB_PRODUCT_KENSINGTON_ORBIT	0x1003		/* Orbit USB/PS2 trackball */
 #define	USB_PRODUCT_KENSINGTON_TURBOBALL	0x1005		/* TurboBall */
 
+/* Keyspan products */
+#define	USB_PRODUCT_KEYSPAN_USA28	0x0101		/* USA-28 serial adapter */
+#define	USB_PRODUCT_KEYSPAN_USA28X	0x0102		/* USA-28X serial adapter */
+#define	USB_PRODUCT_KEYSPAN_USA19	0x0103		/* USA-19 serial adapter */
+#define	USB_PRODUCT_KEYSPAN_USA18X	0x0105		/* USA-18X serial adapter */
+#define	USB_PRODUCT_KEYSPAN_USA19W	0x0106		/* USA-19W serial adapter */
+#define	USB_PRODUCT_KEYSPAN_USA49W	0x0109		/* USA-49W serial adapter */
+
 /* Kingston products */
 #define	USB_PRODUCT_KINGSTON_KNU101TX	0x000a		/* KNU101TX USB Ethernet */
 
@@ -620,6 +646,8 @@
 #define	USB_PRODUCT_LOGITECH_BB13	0xc401		/* USB-PS/2 Trackball */
 #define	USB_PRODUCT_LOGITECH_WMPAD	0xc208		/* WingMan GamePad Extreme */
 #define	USB_PRODUCT_LOGITECH_WMJOY	0xc281		/* WingMan Force joystick */
+#define	USB_PRODUCT_LOGITECH_RK53	0xc501		/* Cordless mouse */
+#define	USB_PRODUCT_LOGITECH_RB6	0xc503		/* Cordless keyboard */
 #define	USB_PRODUCT_LOGITECH_QUICKCAMPRO2	0xd001		/* QuickCam Pro */
 
 /* Lucent products */
@@ -631,6 +659,8 @@
 /* MCT Corp. */
 #define	USB_PRODUCT_MCT_HUB0100	0x0100		/* Hub */
 #define	USB_PRODUCT_MCT_USB232	0x0210		/* USB-232 Interface */
+#define	USB_PRODUCT_MCT_SITECOM_USB232	0x0230		/* Sitecom USB-232 Products */
+#define	USB_PRODUCT_MCT_DU_H3SP_USB232	0x0200		/* D-Link DU-H3SP USB BAY Hub */
 
 /* Melco, Inc products */
 #define	USB_PRODUCT_MELCO_LUATX1	0x0001		/* LUA-TX Ethernet */
@@ -648,6 +678,9 @@
 #define	USB_PRODUCT_MICROSOFT_INTELLIEYE	0x0025		/* IntelliEye mouse */
 #define	USB_PRODUCT_MICROSOFT_INETPRO	0x002b		/* Internet Keyboard Pro */
 
+/* Microtech products */
+#define	USB_PRODUCT_MICROTECH_DPCM	0x0006		/* USB CameraMate */
+
 /* Microtek products */
 #define	USB_PRODUCT_MICROTEK_336CX	0x0094		/* Phantom 336CX - C3 scanner */
 #define	USB_PRODUCT_MICROTEK_X6U	0x0099		/* ScanMaker X6 - X6U */
@@ -673,6 +706,9 @@
 #define	USB_PRODUCT_MUSTEK_1200UB	0x0006		/* 1200 UB scanner */
 #define	USB_PRODUCT_MUSTEK_MDC800	0xa800		/* MDC-800 digital camera */
 
+/* M-Systems products */
+#define	USB_PRODUCT_MSYSTEMS_DISKONKEY	0x0010		/* DiskOnKey */
+
 /* National Semiconductor */
 #define	USB_PRODUCT_NATIONAL_BEARPAW	0x1000		/* BearPaw 1200 */
 
@@ -693,9 +729,12 @@
 #define	USB_PRODUCT_OMNIVISION_OV511	0x0511		/* OV511 Camera */
 #define	USB_PRODUCT_OMNIVISION_OV511PLUS	0xa511		/* OV511+ Camera */
 
-/* Palm Computing, Inc. */
+/* Palm Computing, Inc. product */
 #define	USB_PRODUCT_PALM_SERIAL	0x0080		/* USB Serial Adaptor */
 
+/* Panasonic products */
+#define	USB_PRODUCT_PANASONIC_SDCAAE	0x1b00		/* MultiMediaCard Adapter */
+
 /* Peracom products */
 #define	USB_PRODUCT_PERACOM_SERIAL1	0x0001		/* Serial Converter */
 #define	USB_PRODUCT_PERACOM_ENET	0x0002		/* Ethernet adapter */
@@ -768,6 +807,7 @@
 
 /* Shuttle Technology products */
 #define	USB_PRODUCT_SHUTTLE_EUSB	0x0001		/* E-USB Bridge */
+#define	USB_PRODUCT_SHUTTLE_ZIOMMC	0x0006		/* eUSB MultiMediaCard Adapter */
 
 /* SIIG products */
 #define	USB_PRODUCT_SIIG_DIGIFILMREADER	0x0004		/* DigiFilm-Combo Reader */
@@ -808,7 +848,7 @@
 #define	USB_PRODUCT_DIAMOND2_SUPRA2890	0x0b4a		/* SupraMax 2890 56K Modem */
 #define	USB_PRODUCT_DIAMOND2_RIO600USB	0x5001		/* Rio 600 USB */
 #define	USB_PRODUCT_DIAMOND2_RIO800USB	0x5002		/* Rio 800 USB */
-
+ 
 /* TEAC products */
 #define	USB_PRODUCT_TEAC_FD05PUB	0x0000		/* FD-05PUB floppy */
 
@@ -845,7 +885,7 @@
 #define	USB_PRODUCT_VISIONEER_6200	0x0311		/* OneTouch 6200 */
 #define	USB_PRODUCT_VISIONEER_8100	0x0321		/* OneTouch 8100 */
 #define	USB_PRODUCT_VISIONEER_8600	0x0331		/* OneTouch 8600 */
-
+								       
 /* Wacom products */
 #define	USB_PRODUCT_WACOM_CT0405U	0x0000		/* CT-0405-U Tablet */
 #define	USB_PRODUCT_WACOM_GRAPHIRE	0x0010		/* Graphire */
diff --git a/sys/dev/usb/usbdevs_data.h b/sys/dev/usb/usbdevs_data.h
index 4a94b7d..d6d8f66 100644
--- a/sys/dev/usb/usbdevs_data.h
+++ b/sys/dev/usb/usbdevs_data.h
@@ -4,7 +4,7 @@
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	FreeBSD: src/sys/dev/usb/usbdevs,v 1.50 2001/03/29 00:05:51 peter Exp 
+ *	FreeBSD: src/sys/dev/usb/usbdevs,v 1.51 2001/04/02 13:02:17 n_hibma Exp 
  */
 
 /*
@@ -280,6 +280,12 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "UHB124 hub",
 	},
 	{
+	    USB_VENDOR_ATMEL, USB_PRODUCT_ATMEL_DWL120,
+	    0,
+	    "Atmel Corp.",
+	    "DWL-120 Wireless adapter",
+	},
+	{
 	    USB_VENDOR_AVISION, USB_PRODUCT_AVISION_1200U,
 	    0,
 	    "Avision, Inc.",
@@ -316,6 +322,12 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "PowerShot S10",
 	},
 	{
+	    USB_VENDOR_CANON, USB_PRODUCT_CANON_N656U,
+	    0,
+	    "Canon, Inc.",
+	    "CANOSCAN N656U",
+	},
+	{
 	    USB_VENDOR_CATC, USB_PRODUCT_CATC_NETMATE,
 	    0,
 	    "Computer Access Technology Corp.",
@@ -340,6 +352,12 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "Andromeda hub",
 	},
 	{
+	    USB_VENDOR_CASIO, USB_PRODUCT_CASIO_NAMELAND,
+	    0,
+	    "CASIO",
+	    "CASIO Nameland EZ-USB",
+	},
+	{
 	    USB_VENDOR_CHERRY, USB_PRODUCT_CHERRY_MY3000KBD,
 	    0,
 	    "Cherry Mikroschalter GmbH",
@@ -616,6 +634,12 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "Perfection 1640SU scanner",
 	},
 	{
+	    USB_VENDOR_EPSON, USB_PRODUCT_EPSON_1240,
+	    0,
+	    "Seiko Epson Corp.",
+	    "Perfection 1240U / 1240Photo scanner",
+	},
+	{
 	    USB_VENDOR_ETEK, USB_PRODUCT_ETEK_1COM,
 	    0,
 	    "e-TEK Labs",
@@ -634,6 +658,12 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "GamePad Pro",
 	},
 	{
+	    USB_VENDOR_GREENHOUSE, USB_PRODUCT_GREENHOUSE_KANA21,
+	    0,
+	    "GREENHOUSE Co., Ltd.",
+	    "CF-writer with Portable MP3 Player",
+	},
+	{
 	    USB_VENDOR_GRIFFIN, USB_PRODUCT_GRIFFIN_IMATE,
 	    0,
 	    "Griffin Technology, Inc.",
@@ -664,6 +694,12 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "Handspring Visor",
 	},
 	{
+	    USB_VENDOR_HAUPPAUGE, USB_PRODUCT_HAUPPAUGE_WINTV_USB_FM,
+	    0,
+	    "Hauppauge Computer Works",
+	    "WinTV USB FM",
+	},
+	{
 	    USB_VENDOR_HP, USB_PRODUCT_HP_4100C,
 	    0,
 	    "Hewlett Packard",
@@ -850,6 +886,42 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "TurboBall",
 	},
 	{
+	    USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA28,
+	    0,
+	    "Keyspan",
+	    "USA-28 serial adapter",
+	},
+	{
+	    USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA28X,
+	    0,
+	    "Keyspan",
+	    "USA-28X serial adapter",
+	},
+	{
+	    USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA19,
+	    0,
+	    "Keyspan",
+	    "USA-19 serial adapter",
+	},
+	{
+	    USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA18X,
+	    0,
+	    "Keyspan",
+	    "USA-18X serial adapter",
+	},
+	{
+	    USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA19W,
+	    0,
+	    "Keyspan",
+	    "USA-19W serial adapter",
+	},
+	{
+	    USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA49W,
+	    0,
+	    "Keyspan",
+	    "USA-49W serial adapter",
+	},
+	{
 	    USB_VENDOR_KINGSTON, USB_PRODUCT_KINGSTON_KNU101TX,
 	    0,
 	    "Kingston Technology",
@@ -1048,6 +1120,18 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "WingMan Force joystick",
 	},
 	{
+	    USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_RK53,
+	    0,
+	    "Logitech, Inc.",
+	    "Cordless mouse",
+	},
+	{
+	    USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_RB6,
+	    0,
+	    "Logitech, Inc.",
+	    "Cordless keyboard",
+	},
+	{
 	    USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QUICKCAMPRO2,
 	    0,
 	    "Logitech, Inc.",
@@ -1078,6 +1162,18 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "USB-232 Interface",
 	},
 	{
+	    USB_VENDOR_MCT, USB_PRODUCT_MCT_SITECOM_USB232,
+	    0,
+	    "MCT Corp.",
+	    "Sitecom USB-232 Products",
+	},
+	{
+	    USB_VENDOR_MCT, USB_PRODUCT_MCT_DU_H3SP_USB232,
+	    0,
+	    "MCT Corp.",
+	    "D-Link DU-H3SP USB BAY Hub",
+	},
+	{
 	    USB_VENDOR_MELCO, USB_PRODUCT_MELCO_LUATX1,
 	    0,
 	    "Melco, Inc.",
@@ -1138,6 +1234,12 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "Internet Keyboard Pro",
 	},
 	{
+	    USB_VENDOR_MICROTECH, USB_PRODUCT_MICROTECH_DPCM,
+	    0,
+	    "Microtech",
+	    "USB CameraMate",
+	},
+	{
 	    USB_VENDOR_MICROTEK, USB_PRODUCT_MICROTEK_336CX,
 	    0,
 	    "Microtek",
@@ -1228,6 +1330,12 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "MDC-800 digital camera",
 	},
 	{
+	    USB_VENDOR_MSYSTEMS, USB_PRODUCT_MSYSTEMS_DISKONKEY,
+	    0,
+	    "M-Systems",
+	    "DiskOnKey",
+	},
+	{
 	    USB_VENDOR_NATIONAL, USB_PRODUCT_NATIONAL_BEARPAW,
 	    0,
 	    "National Semiconductor",
@@ -1282,6 +1390,12 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "USB Serial Adaptor",
 	},
 	{
+	    USB_VENDOR_PANASONIC, USB_PRODUCT_PANASONIC_SDCAAE,
+	    0,
+	    "Panasonic (Matsushita)",
+	    "MultiMediaCard Adapter",
+	},
+	{
 	    USB_VENDOR_PERACOM, USB_PRODUCT_PERACOM_SERIAL1,
 	    0,
 	    "Peracom Networks, Inc.",
@@ -1528,6 +1642,12 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "E-USB Bridge",
 	},
 	{
+	    USB_VENDOR_SHUTTLE, USB_PRODUCT_SHUTTLE_ZIOMMC,
+	    0,
+	    "Shuttle Technology",
+	    "eUSB MultiMediaCard Adapter",
+	},
+	{
 	    USB_VENDOR_SIIG, USB_PRODUCT_SIIG_DIGIFILMREADER,
 	    0,
 	    "SIIG",
@@ -2176,6 +2296,12 @@ struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_PANASONIC, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Panasonic (Matsushita)",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_SHUTTLE, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "Shuttle Technology",
@@ -2356,6 +2482,12 @@ struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_HAUPPAUGE, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Hauppauge Computer Works",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_BAFO, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "BAFO/Quality Computer Accessories",
@@ -2680,6 +2812,12 @@ struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_KEYSPAN, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Keyspan",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_AASHIMA, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "Aashima Technology B.V.",
@@ -2860,6 +2998,12 @@ struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_CASIO, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "CASIO",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_APTIO, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "Aptio Products, Inc.",
@@ -3004,6 +3148,12 @@ struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_MSYSTEMS, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "M-Systems",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_AUTHENTEC, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "AuthenTec, Inc.",
@@ -3148,6 +3298,12 @@ struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_GREENHOUSE, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "GREENHOUSE Co., Ltd.",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_GEOCAST, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "Geocast Network Systems",