Regenerate.

1 files changed, 447 insertions, 351 deletions

diff --git a/sys/dev/usb/usbdevs_data.h b/sys/dev/usb/usbdevs_data.h
index fab5a45..08a5d83 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.72 2002/01/03 18:56:35 joe Exp 
+ *	FreeBSD: src/sys/dev/usb/usbdevs,v 1.76 2002/02/02 21:09:54 joe Exp 
  */
 
 /*
@@ -48,26 +48,26 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_3COM, USB_PRODUCT_3COM_HOMECONN,
 	    0,
-	    "3Com Corp.",
+	    "3Com",
 	    "HomeConnect USB Camera",
 	},
 	{
 	    USB_VENDOR_3COM, USB_PRODUCT_3COM_3C19250,
 	    0,
-	    "3Com Corp.",
+	    "3Com",
 	    "3C19250 Ethernet adapter",
 	},
 	{
 	    USB_VENDOR_3COM, USB_PRODUCT_3COM_USR56K,
 	    0,
-	    "3Com Corp.",
+	    "3Com",
 	    "U.S.Robotics 56000 Voice Faxmodem Pro",
 	},
 	{
 	    USB_VENDOR_3COM, USB_PRODUCT_3COM_3C460,
 	    0,
-	    "3Com Corp.",
-	    "HomeConnect Ethernet USB Adapter",
+	    "3Com",
+	    "HomeConnect 3C460",
 	},
 	{
 	    USB_VENDOR_3COMUSR, USB_PRODUCT_3COMUSR_OFFICECONN,
@@ -96,67 +96,67 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_URE450,
 	    0,
-	    "AboCom Systems, Inc.",
+	    "AboCom Systems",
 	    "URE450 Ethernet Adapter",
 	},
 	{
 	    USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_DSB650TX_PNA,
 	    0,
-	    "AboCom Systems, Inc.",
+	    "AboCom Systems",
 	    "1/10/100 ethernet adapter",
 	},
 	{
 	    USB_VENDOR_ACCTON, USB_PRODUCT_ACCTON_USB320_EC,
 	    0,
-	    "Accton Technology Corp.",
+	    "Accton Technology",
 	    "USB320-EC Ethernet Adapter",
 	},
 	{
 	    USB_VENDOR_ACERP, USB_PRODUCT_ACERP_ACERSCAN_C310U,
 	    0,
-	    "Acer Peripherals, Inc.",
+	    "Acer Peripherals",
 	    "Acerscan C310U",
 	},
 	{
 	    USB_VENDOR_ACERP, USB_PRODUCT_ACERP_ACERSCAN_320U,
 	    0,
-	    "Acer Peripherals, Inc.",
+	    "Acer Peripherals",
 	    "Acerscan 320U",
 	},
 	{
 	    USB_VENDOR_ACERP, USB_PRODUCT_ACERP_ACERSCAN_640U,
 	    0,
-	    "Acer Peripherals, Inc.",
+	    "Acer Peripherals",
 	    "Acerscan 640U",
 	},
 	{
 	    USB_VENDOR_ACERP, USB_PRODUCT_ACERP_ACERSCAN_620U,
 	    0,
-	    "Acer Peripherals, Inc.",
+	    "Acer Peripherals",
 	    "Acerscan 620U",
 	},
 	{
 	    USB_VENDOR_ACTIVEWIRE, USB_PRODUCT_ACTIVEWIRE_IOBOARD,
 	    0,
-	    "ActiveWire, Inc.",
+	    "ActiveWire",
 	    "I/O Board",
 	},
 	{
 	    USB_VENDOR_ACTIVEWIRE, USB_PRODUCT_ACTIVEWIRE_IOBOARD_FW1,
 	    0,
-	    "ActiveWire, Inc.",
+	    "ActiveWire",
 	    "I/O Board, rev. 1 firmware",
 	},
 	{
 	    USB_VENDOR_ADMTEK, USB_PRODUCT_ADMTEK_PEGASUS,
 	    0,
-	    "ADMtek, Inc.",
+	    "ADMtek",
 	    "AN986 USB Ethernet adapter",
 	},
 	{
 	    USB_VENDOR_ADS, USB_PRODUCT_ADS_UBS10BT,
 	    0,
-	    "ADS Technologies, Inc.",
+	    "ADS Technologies",
 	    "UBS-10BT Ethernet adapter",
 	},
 	{
@@ -168,67 +168,67 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_AGFA, USB_PRODUCT_AGFA_SNAPSCAN1212U,
 	    0,
-	    "AGFA-Gevaert NV",
+	    "AGFA-Gevaert",
 	    "SnapScan 1212U",
 	},
 	{
 	    USB_VENDOR_AGFA, USB_PRODUCT_AGFA_SNAPSCAN1236U,
 	    0,
-	    "AGFA-Gevaert NV",
+	    "AGFA-Gevaert",
 	    "SnapScan 1236U",
 	},
 	{
 	    USB_VENDOR_AGFA, USB_PRODUCT_AGFA_SNAPSCANTOUCH,
 	    0,
-	    "AGFA-Gevaert NV",
+	    "AGFA-Gevaert",
 	    "SnapScan Touch",
 	},
 	{
 	    USB_VENDOR_AGFA, USB_PRODUCT_AGFA_SNAPSCAN1212U2,
 	    0,
-	    "AGFA-Gevaert NV",
+	    "AGFA-Gevaert",
 	    "SnapScan 1212U",
 	},
 	{
 	    USB_VENDOR_AGFA, USB_PRODUCT_AGFA_SNAPSCANE40,
 	    0,
-	    "AGFA-Gevaert NV",
+	    "AGFA-Gevaert",
 	    "SnapScan e40",
 	},
 	{
 	    USB_VENDOR_AGFA, USB_PRODUCT_AGFA_SNAPSCANE50,
 	    0,
-	    "AGFA-Gevaert NV",
+	    "AGFA-Gevaert",
 	    "SnapScan e50",
 	},
 	{
 	    USB_VENDOR_AGFA, USB_PRODUCT_AGFA_SNAPSCANE20,
 	    0,
-	    "AGFA-Gevaert NV",
+	    "AGFA-Gevaert",
 	    "SnapScan e20",
 	},
 	{
 	    USB_VENDOR_AGFA, USB_PRODUCT_AGFA_SNAPSCANE25,
 	    0,
-	    "AGFA-Gevaert NV",
+	    "AGFA-Gevaert",
 	    "SnapScan e25",
 	},
 	{
 	    USB_VENDOR_AGFA, USB_PRODUCT_AGFA_SNAPSCANE26,
 	    0,
-	    "AGFA-Gevaert NV",
+	    "AGFA-Gevaert",
 	    "SnapScan e26",
 	},
 	{
 	    USB_VENDOR_AGFA, USB_PRODUCT_AGFA_SNAPSCANE52,
 	    0,
-	    "AGFA-Gevaert NV",
+	    "AGFA-Gevaert",
 	    "SnapScan e52",
 	},
 	{
 	    USB_VENDOR_ELECOM, USB_PRODUCT_ELECOM_MOUSE29UO,
 	    0,
-	    "Elecom Corp. Ltd.",
+	    "Elecom",
 	    "mouse 29UO",
 	},
 	{
@@ -240,43 +240,43 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_ALCOR2, USB_PRODUCT_ALCOR2_KBD_HUB,
 	    0,
-	    "Alcor Micro, Inc.",
+	    "Alcor Micro",
 	    "Kbd Hub",
 	},
 	{
 	    USB_VENDOR_ALCOR, USB_PRODUCT_ALCOR_MA_KBD_HUB,
 	    0,
-	    "Alcor Micro, Inc.",
+	    "Alcor Micro",
 	    "MacAlly Kbd Hub",
 	},
 	{
 	    USB_VENDOR_ALCOR, USB_PRODUCT_ALCOR_AU9814,
 	    0,
-	    "Alcor Micro, Inc.",
+	    "Alcor Micro",
 	    "AU9814 Hub",
 	},
 	{
 	    USB_VENDOR_ALCOR, USB_PRODUCT_ALCOR_SM_KBD,
 	    0,
-	    "Alcor Micro, Inc.",
+	    "Alcor Micro",
 	    "MicroConnectors/StrongMan Keyboard",
 	},
 	{
 	    USB_VENDOR_ALCOR, USB_PRODUCT_ALCOR_NEC_KBD_HUB,
 	    0,
-	    "Alcor Micro, Inc.",
+	    "Alcor Micro",
 	    "NEC Kbd Hub",
 	},
 	{
 	    USB_VENDOR_ALTEC, USB_PRODUCT_ALTEC_ADA70,
 	    0,
-	    "Altec Lansing Technologies, Inc.",
+	    "Altec Lansing Technologies",
 	    "ADA70 Speakers",
 	},
 	{
 	    USB_VENDOR_ALTEC, USB_PRODUCT_ALTEC_ASC495,
 	    0,
-	    "Altec Lansing Technologies, Inc.",
+	    "Altec Lansing Technologies",
 	    "ASC495 Speakers",
 	},
 	{
@@ -288,19 +288,19 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_ANCHOR, USB_PRODUCT_ANCHOR_EZUSB,
 	    0,
-	    "Anchor Chips, Inc.",
+	    "Anchor Chips",
 	    "EZUSB",
 	},
 	{
 	    USB_VENDOR_ANCHOR, USB_PRODUCT_ANCHOR_EZLINK,
 	    0,
-	    "Anchor Chips, Inc.",
+	    "Anchor Chips",
 	    "EZLINK",
 	},
 	{
 	    USB_VENDOR_AOX, USB_PRODUCT_AOX_USB101,
 	    0,
-	    "AOX, Inc.",
+	    "AOX",
 	    "USB ethernet controller engine",
 	},
 	{
@@ -318,55 +318,55 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_ATEN, USB_PRODUCT_ATEN_UC1284,
 	    0,
-	    "ATEN International Co. Ltd.",
+	    "ATEN International",
 	    "Parallel printer adapter",
 	},
 	{
 	    USB_VENDOR_ATEN, USB_PRODUCT_ATEN_UC10T,
 	    0,
-	    "ATEN International Co. Ltd.",
+	    "ATEN International",
 	    "10Mbps ethernet adapter",
 	},
 	{
 	    USB_VENDOR_ATEN, USB_PRODUCT_ATEN_UC232A,
 	    0,
-	    "ATEN International Co. Ltd.",
+	    "ATEN International",
 	    "Serial adapter",
 	},
 	{
 	    USB_VENDOR_ATMEL, USB_PRODUCT_ATMEL_UHB124,
 	    0,
-	    "Atmel Corp.",
+	    "Atmel",
 	    "UHB124 hub",
 	},
 	{
 	    USB_VENDOR_ATMEL, USB_PRODUCT_ATMEL_DWL120,
 	    0,
-	    "Atmel Corp.",
+	    "Atmel",
 	    "DWL-120 Wireless adapter",
 	},
 	{
 	    USB_VENDOR_AVISION, USB_PRODUCT_AVISION_1200U,
 	    0,
-	    "Avision, Inc.",
+	    "Avision",
 	    "1200U scanner",
 	},
 	{
 	    USB_VENDOR_BELKIN2, USB_PRODUCT_BELKIN2_F5U002,
 	    0,
-	    "Belkin Components (2nd)",
+	    "Belkin Components",
 	    "F5U002 Parallel printer adapter",
 	},
 	{
 	    USB_VENDOR_BILLIONTON, USB_PRODUCT_BILLIONTON_USB100,
 	    0,
-	    "Billionton Systems, Inc.",
+	    "Billionton Systems",
 	    "USB100N 10/100 FastEthernet Adapter",
 	},
 	{
 	    USB_VENDOR_BROTHER, USB_PRODUCT_BROTHER_HL1050,
 	    0,
-	    "Brother Industries, Ltd.",
+	    "Brother Industries",
 	    "HL-1050 laser printer",
 	},
 	{
@@ -378,43 +378,43 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_CANON, USB_PRODUCT_CANON_N656U,
 	    0,
-	    "Canon, Inc.",
+	    "Canon",
 	    "CANOSCAN N656U",
 	},
 	{
 	    USB_VENDOR_CANON, USB_PRODUCT_CANON_S10,
 	    0,
-	    "Canon, Inc.",
+	    "Canon",
 	    "PowerShot S10",
 	},
 	{
 	    USB_VENDOR_CANON, USB_PRODUCT_CANON_S100,
 	    0,
-	    "Canon, Inc.",
+	    "Canon",
 	    "PowerShot S100",
 	},
 	{
 	    USB_VENDOR_CATC, USB_PRODUCT_CATC_NETMATE,
 	    0,
-	    "Computer Access Technology Corp.",
+	    "Computer Access Technology",
 	    "Netmate ethernet adapter",
 	},
 	{
 	    USB_VENDOR_CATC, USB_PRODUCT_CATC_NETMATE2,
 	    0,
-	    "Computer Access Technology Corp.",
+	    "Computer Access Technology",
 	    "Netmate2 ethernet adapter",
 	},
 	{
 	    USB_VENDOR_CATC, USB_PRODUCT_CATC_CHIEF,
 	    0,
-	    "Computer Access Technology Corp.",
+	    "Computer Access Technology",
 	    "USB Chief Bus & Protocol Analyzer",
 	},
 	{
 	    USB_VENDOR_CATC, USB_PRODUCT_CATC_ANDROMEDA,
 	    0,
-	    "Computer Access Technology Corp.",
+	    "Computer Access Technology",
 	    "Andromeda hub",
 	},
 	{
@@ -426,13 +426,13 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_CHERRY, USB_PRODUCT_CHERRY_MY3000KBD,
 	    0,
-	    "Cherry Mikroschalter GmbH",
+	    "Cherry Mikroschalter",
 	    "My3000 keyboard",
 	},
 	{
 	    USB_VENDOR_CHERRY, USB_PRODUCT_CHERRY_MY3000HUB,
 	    0,
-	    "Cherry Mikroschalter GmbH",
+	    "Cherry Mikroschalter",
 	    "My3000 hub",
 	},
 	{
@@ -450,7 +450,7 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_CHICONY, USB_PRODUCT_CHICONY_KB8933,
 	    0,
-	    "Chicony Electronics Co., Ltd.",
+	    "Chicony Electronics",
 	    "KB-8933 keyboard",
 	},
 	{
@@ -462,7 +462,7 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_CONNECTIX, USB_PRODUCT_CONNECTIX_QUICKCAM,
 	    0,
-	    "Connectix Corp.",
+	    "Connectix",
 	    "QuickCam",
 	},
 	{
@@ -510,25 +510,25 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DSB650C,
 	    0,
-	    "D-Link Corp",
+	    "D-Link",
 	    "10Mbps ethernet adapter",
 	},
 	{
 	    USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DSB650TX,
 	    0,
-	    "D-Link Corp",
+	    "D-Link",
 	    "10/100 ethernet adapter",
 	},
 	{
 	    USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DSB650TX_PNA,
 	    0,
-	    "D-Link Corp",
+	    "D-Link",
 	    "1/10/100 ethernet adapter",
 	},
 	{
 	    USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DSB650,
 	    0,
-	    "D-Link Corp",
+	    "D-Link",
 	    "10/100 ethernet adapter",
 	},
 	{
@@ -582,7 +582,7 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_ELSA, USB_PRODUCT_ELSA_MODEM1,
 	    0,
-	    "ELSA Gmbh",
+	    "ELSA",
 	    "ELSA Modem Board",
 	},
 	{
@@ -642,61 +642,61 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_EPSON, USB_PRODUCT_EPSON_PRINTER1,
 	    0,
-	    "Seiko Epson Corp.",
+	    "Seiko Epson",
 	    "USB Printer",
 	},
 	{
 	    USB_VENDOR_EPSON, USB_PRODUCT_EPSON_PRINTER2,
 	    0,
-	    "Seiko Epson Corp.",
+	    "Seiko Epson",
 	    "ISD USB Smart Cable for Mac",
 	},
 	{
 	    USB_VENDOR_EPSON, USB_PRODUCT_EPSON_PRINTER3,
 	    0,
-	    "Seiko Epson Corp.",
+	    "Seiko Epson",
 	    "ISD USB Smart Cable",
 	},
 	{
 	    USB_VENDOR_EPSON, USB_PRODUCT_EPSON_PRINTER5,
 	    0,
-	    "Seiko Epson Corp.",
+	    "Seiko Epson",
 	    "USB Printer",
 	},
 	{
 	    USB_VENDOR_EPSON, USB_PRODUCT_EPSON_636,
 	    0,
-	    "Seiko Epson Corp.",
+	    "Seiko Epson",
 	    "Perfection 636U / 636Photo scanner",
 	},
 	{
 	    USB_VENDOR_EPSON, USB_PRODUCT_EPSON_610,
 	    0,
-	    "Seiko Epson Corp.",
+	    "Seiko Epson",
 	    "Perfection 610 scanner",
 	},
 	{
 	    USB_VENDOR_EPSON, USB_PRODUCT_EPSON_1200,
 	    0,
-	    "Seiko Epson Corp.",
+	    "Seiko Epson",
 	    "Perfection 1200U / 1200Photo scanner",
 	},
 	{
 	    USB_VENDOR_EPSON, USB_PRODUCT_EPSON_1600,
 	    0,
-	    "Seiko Epson Corp.",
+	    "Seiko Epson",
 	    "Expression 1600 scanner",
 	},
 	{
 	    USB_VENDOR_EPSON, USB_PRODUCT_EPSON_1640,
 	    0,
-	    "Seiko Epson Corp.",
+	    "Seiko Epson",
 	    "Perfection 1640SU scanner",
 	},
 	{
 	    USB_VENDOR_EPSON, USB_PRODUCT_EPSON_1240,
 	    0,
-	    "Seiko Epson Corp.",
+	    "Seiko Epson",
 	    "Perfection 1240U / 1240Photo scanner",
 	},
 	{
@@ -708,25 +708,25 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_EXTENDED, USB_PRODUCT_EXTENDED_XTNDACCESS,
 	    0,
-	    "Extended Systems, Inc.",
+	    "Extended Systems",
 	    "XTNDAccess IrDA",
 	},
 	{
 	    USB_VENDOR_GRAVIS, USB_PRODUCT_GRAVIS_GAMEPADPRO,
 	    0,
-	    "Advanced Gravis Computer Tech. Ltd.",
+	    "Advanced Gravis Computer Tech.",
 	    "GamePad Pro",
 	},
 	{
 	    USB_VENDOR_GREENHOUSE, USB_PRODUCT_GREENHOUSE_KANA21,
 	    0,
-	    "GREENHOUSE Co., Ltd.",
+	    "GREENHOUSE",
 	    "CF-writer with Portable MP3 Player",
 	},
 	{
 	    USB_VENDOR_GRIFFIN, USB_PRODUCT_GRIFFIN_IMATE,
 	    0,
-	    "Griffin Technology, Inc.",
+	    "Griffin Technology",
 	    "iMate, ADB adapter",
 	},
 	{
@@ -744,7 +744,7 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_FUJIPHOTO, USB_PRODUCT_FUJIPHOTO_MASS0100,
 	    0,
-	    "Fuji Photo Film Co., Ltd.",
+	    "Fuji Photo Film",
 	    "Mass Storage",
 	},
 	{
@@ -768,7 +768,7 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_HANDSPRING, USB_PRODUCT_HANDSPRING_VISOR,
 	    0,
-	    "Handspring, Inc.",
+	    "Handspring",
 	    "Handspring Visor",
 	},
 	{
@@ -780,157 +780,157 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_HP, USB_PRODUCT_HP_895C,
 	    0,
-	    "Hewlett-Packard",
+	    "Hewlett Packard",
 	    "DeskJet 895C",
 	},
 	{
 	    USB_VENDOR_HP, USB_PRODUCT_HP_4100C,
 	    0,
-	    "Hewlett-Packard",
+	    "Hewlett Packard",
 	    "Scanjet 4100C",
 	},
 	{
 	    USB_VENDOR_HP, USB_PRODUCT_HP_S20,
 	    0,
-	    "Hewlett-Packard",
+	    "Hewlett Packard",
 	    "Photosmart S20",
 	},
 	{
 	    USB_VENDOR_HP, USB_PRODUCT_HP_880C,
 	    0,
-	    "Hewlett-Packard",
+	    "Hewlett Packard",
 	    "DeskJet 880C",
 	},
 	{
 	    USB_VENDOR_HP, USB_PRODUCT_HP_4200C,
 	    0,
-	    "Hewlett-Packard",
+	    "Hewlett Packard",
 	    "ScanJet 4200C",
 	},
 	{
 	    USB_VENDOR_HP, USB_PRODUCT_HP_CDWRITERPLUS,
 	    0,
-	    "Hewlett-Packard",
+	    "Hewlett Packard",
 	    "CD-Writer Plus",
 	},
 	{
 	    USB_VENDOR_HP, USB_PRODUCT_HP_KBDHUB,
 	    0,
-	    "Hewlett-Packard",
+	    "Hewlett Packard",
 	    "Multimedia Keyboard Hub",
 	},
 	{
 	    USB_VENDOR_HP, USB_PRODUCT_HP_6200C,
 	    0,
-	    "Hewlett-Packard",
+	    "Hewlett Packard",
 	    "ScanJet 6200C",
 	},
 	{
 	    USB_VENDOR_HP, USB_PRODUCT_HP_S20b,
 	    0,
-	    "Hewlett-Packard",
+	    "Hewlett Packard",
 	    "PhotoSmart S20",
 	},
 	{
 	    USB_VENDOR_HP, USB_PRODUCT_HP_815C,
 	    0,
-	    "Hewlett-Packard",
+	    "Hewlett Packard",
 	    "DeskJet 815C",
 	},
 	{
 	    USB_VENDOR_HP, USB_PRODUCT_HP_3300C,
 	    0,
-	    "Hewlett-Packard",
+	    "Hewlett Packard",
 	    "ScanJet 3300C",
 	},
 	{
 	    USB_VENDOR_HP, USB_PRODUCT_HP_CDW8200,
 	    0,
-	    "Hewlett-Packard",
+	    "Hewlett Packard",
 	    "CD-Writer Plus 8200e",
 	},
 	{
 	    USB_VENDOR_HP, USB_PRODUCT_HP_810C,
 	    0,
-	    "Hewlett-Packard",
+	    "Hewlett Packard",
 	    "DeskJet 810C/812C",
 	},
 	{
 	    USB_VENDOR_HP, USB_PRODUCT_HP_4300C,
 	    0,
-	    "Hewlett-Packard",
+	    "Hewlett Packard",
 	    "Scanjet 4300C",
 	},
 	{
 	    USB_VENDOR_HP, USB_PRODUCT_HP_G85XI,
 	    0,
-	    "Hewlett-Packard",
+	    "Hewlett Packard",
 	    "OfficeJet G85xi",
 	},
 	{
 	    USB_VENDOR_HP, USB_PRODUCT_HP_5200C,
 	    0,
-	    "Hewlett-Packard",
+	    "Hewlett Packard",
 	    "Scanjet 5200C",
 	},
 	{
 	    USB_VENDOR_HP, USB_PRODUCT_HP_830C,
 	    0,
-	    "Hewlett-Packard",
+	    "Hewlett Packard",
 	    "DeskJet 830C",
 	},
 	{
 	    USB_VENDOR_HP, USB_PRODUCT_HP_3400CSE,
 	    0,
-	    "Hewlett-Packard",
+	    "Hewlett Packard",
 	    "ScanJet 3400cse",
 	},
 	{
 	    USB_VENDOR_HP, USB_PRODUCT_HP_6300C,
 	    0,
-	    "Hewlett-Packard",
+	    "Hewlett Packard",
 	    "Scanjet 6300C",
 	},
 	{
 	    USB_VENDOR_HP, USB_PRODUCT_HP_840C,
 	    0,
-	    "Hewlett-Packard",
+	    "Hewlett Packard",
 	    "DeskJet 840c",
 	},
 	{
 	    USB_VENDOR_HP, USB_PRODUCT_HP_5300C,
 	    0,
-	    "Hewlett-Packard",
+	    "Hewlett Packard",
 	    "Scanjet 5300C",
 	},
 	{
 	    USB_VENDOR_HP, USB_PRODUCT_HP_970CSE,
 	    0,
-	    "Hewlett-Packard",
+	    "Hewlett Packard",
 	    "Deskjet 970Cse",
 	},
 	{
 	    USB_VENDOR_HP, USB_PRODUCT_HP_930C,
 	    0,
-	    "Hewlett-Packard",
+	    "Hewlett Packard",
 	    "DeskJet 930c",
 	},
 	{
 	    USB_VENDOR_HP, USB_PRODUCT_HP_640C,
 	    0,
-	    "Hewlett-Packard",
+	    "Hewlett Packard",
 	    "DeskJet 640c",
 	},
 	{
 	    USB_VENDOR_HP, USB_PRODUCT_HP_P1100,
 	    0,
-	    "Hewlett-Packard",
+	    "Hewlett Packard",
 	    "Photosmart P1100",
 	},
 	{
 	    USB_VENDOR_HP2, USB_PRODUCT_HP2_C500,
 	    0,
-	    "Hewlett-Packard",
+	    "Hewlett Packard",
 	    "PhotoSmart C500",
 	},
 	{
@@ -1008,13 +1008,13 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_IOMEGA, USB_PRODUCT_IOMEGA_ZIP100,
 	    0,
-	    "Iomega Corp.",
+	    "Iomega",
 	    "Zip 100",
 	},
 	{
 	    USB_VENDOR_IOMEGA, USB_PRODUCT_IOMEGA_ZIP250,
 	    0,
-	    "Iomega Corp.",
+	    "Iomega",
 	    "Zip 250",
 	},
 	{
@@ -1026,13 +1026,13 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_KAWATSU, USB_PRODUCT_KAWATSU_MH4000P,
 	    0,
-	    "Kawatsu Semiconductor, Inc.",
+	    "Kawatsu Semiconductor",
 	    "MiniHub 4000P",
 	},
 	{
 	    USB_VENDOR_KEISOKUGIKEN, USB_PRODUCT_KEISOKUGIKEN_USBDAQ,
 	    0,
-	    "Keisokugiken Corp.",
+	    "Keisokugiken",
 	    "HKS-0200 USBDAQ",
 	},
 	{
@@ -1098,67 +1098,67 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_KODAK, USB_PRODUCT_KODAK_DC220,
 	    0,
-	    "Eastman Kodak Corp.",
+	    "Eastman Kodak",
 	    "Digital Science DC220",
 	},
 	{
 	    USB_VENDOR_KODAK, USB_PRODUCT_KODAK_DC260,
 	    0,
-	    "Eastman Kodak Corp.",
+	    "Eastman Kodak",
 	    "Digital Science DC260",
 	},
 	{
 	    USB_VENDOR_KODAK, USB_PRODUCT_KODAK_DC265,
 	    0,
-	    "Eastman Kodak Corp.",
+	    "Eastman Kodak",
 	    "Digital Science DC265",
 	},
 	{
 	    USB_VENDOR_KODAK, USB_PRODUCT_KODAK_DC290,
 	    0,
-	    "Eastman Kodak Corp.",
+	    "Eastman Kodak",
 	    "Digital Science DC290",
 	},
 	{
 	    USB_VENDOR_KODAK, USB_PRODUCT_KODAK_DC240,
 	    0,
-	    "Eastman Kodak Corp.",
+	    "Eastman Kodak",
 	    "Digital Science DC240",
 	},
 	{
 	    USB_VENDOR_KODAK, USB_PRODUCT_KODAK_DC280,
 	    0,
-	    "Eastman Kodak Corp.",
+	    "Eastman Kodak",
 	    "Digital Science DC280",
 	},
 	{
 	    USB_VENDOR_KONICA, USB_PRODUCT_KONICA_CAMERA,
 	    0,
-	    "Konica Corp.",
+	    "Konica",
 	    "Digital Color Camera",
 	},
 	{
 	    USB_VENDOR_KYE, USB_PRODUCT_KYE_NICHE,
 	    0,
-	    "KYE Systems Corp.",
+	    "KYE Systems",
 	    "Niche mouse",
 	},
 	{
 	    USB_VENDOR_KYE, USB_PRODUCT_KYE_NETSCROLL,
 	    0,
-	    "KYE Systems Corp.",
+	    "KYE Systems",
 	    "Genius NetScroll mouse",
 	},
 	{
 	    USB_VENDOR_KYE, USB_PRODUCT_KYE_FLIGHT2000,
 	    0,
-	    "KYE Systems Corp.",
+	    "KYE Systems",
 	    "Flight 2000 joystick",
 	},
 	{
 	    USB_VENDOR_KYE, USB_PRODUCT_KYE_VIVIDPRO,
 	    0,
-	    "KYE Systems Corp.",
+	    "KYE Systems",
 	    "ColorPage Vivid-Pro scanner",
 	},
 	{
@@ -1182,157 +1182,157 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_LEXMARK, USB_PRODUCT_LEXMARK_S2450,
 	    0,
-	    "Lexmark International, Inc.",
+	    "Lexmark International",
 	    "Optra S 2450",
 	},
 	{
 	    USB_VENDOR_LINKSYS, USB_PRODUCT_LINKSYS_MAUSB2,
 	    0,
-	    "Linksys, Inc.",
+	    "Linksys",
 	    "Camedia MAUSB-2",
 	},
 	{
 	    USB_VENDOR_LINKSYS, USB_PRODUCT_LINKSYS_USB10T,
 	    0,
-	    "Linksys, Inc.",
+	    "Linksys",
 	    "USB10T Ethernet",
 	},
 	{
 	    USB_VENDOR_LINKSYS, USB_PRODUCT_LINKSYS_USB100TX,
 	    0,
-	    "Linksys, Inc.",
+	    "Linksys",
 	    "USB100TX Ethernet",
 	},
 	{
 	    USB_VENDOR_LINKSYS, USB_PRODUCT_LINKSYS_USB100H1,
 	    0,
-	    "Linksys, Inc.",
+	    "Linksys",
 	    "USB100H1 Ethernet/HPNA",
 	},
 	{
 	    USB_VENDOR_LINKSYS, USB_PRODUCT_LINKSYS_USB10TA,
 	    0,
-	    "Linksys, Inc.",
+	    "Linksys",
 	    "USB10TA Ethernet",
 	},
 	{
 	    USB_VENDOR_LINKSYS, USB_PRODUCT_LINKSYS_USB10TX2,
 	    0,
-	    "Linksys, Inc.",
+	    "Linksys",
 	    "USB10TX",
 	},
 	{
 	    USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_M2452,
 	    0,
-	    "Logitech, Inc.",
+	    "Logitech",
 	    "M2452 keyboard",
 	},
 	{
 	    USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_M4848,
 	    0,
-	    "Logitech, Inc.",
+	    "Logitech",
 	    "M4848 mouse",
 	},
 	{
 	    USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_PAGESCAN,
 	    0,
-	    "Logitech, Inc.",
+	    "Logitech",
 	    "PageScan",
 	},
 	{
 	    USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QUICKCAMWEB,
 	    0,
-	    "Logitech, Inc.",
+	    "Logitech",
 	    "QuickCam Web",
 	},
 	{
 	    USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QUICKCAMPRO,
 	    0,
-	    "Logitech, Inc.",
+	    "Logitech",
 	    "QuickCam Pro",
 	},
 	{
 	    USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QUICKCAMEXP,
 	    0,
-	    "Logitech, Inc.",
+	    "Logitech",
 	    "QuickCam Express",
 	},
 	{
 	    USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QUICKCAM,
 	    0,
-	    "Logitech, Inc.",
+	    "Logitech",
 	    "QuickCam",
 	},
 	{
 	    USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_N43,
 	    0,
-	    "Logitech, Inc.",
+	    "Logitech",
 	    "N43",
 	},
 	{
 	    USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_N48,
 	    0,
-	    "Logitech, Inc.",
+	    "Logitech",
 	    "N48 mouse",
 	},
 	{
 	    USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_MBA47,
 	    0,
-	    "Logitech, Inc.",
+	    "Logitech",
 	    "M-BA47 mouse",
 	},
 	{
 	    USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_WMMOUSE,
 	    0,
-	    "Logitech, Inc.",
+	    "Logitech",
 	    "WingMan Gaming Mouse",
 	},
 	{
 	    USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_BD58,
 	    0,
-	    "Logitech, Inc.",
+	    "Logitech",
 	    "BD58 mouse",
 	},
 	{
 	    USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_UN58A,
 	    0,
-	    "Logitech, Inc.",
+	    "Logitech",
 	    "iFeel Mouse",
 	},
 	{
 	    USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_BB13,
 	    0,
-	    "Logitech, Inc.",
+	    "Logitech",
 	    "USB-PS/2 Trackball",
 	},
 	{
 	    USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_WMPAD,
 	    0,
-	    "Logitech, Inc.",
+	    "Logitech",
 	    "WingMan GamePad Extreme",
 	},
 	{
 	    USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_WMJOY,
 	    0,
-	    "Logitech, Inc.",
+	    "Logitech",
 	    "WingMan Force joystick",
 	},
 	{
 	    USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_RK53,
 	    0,
-	    "Logitech, Inc.",
+	    "Logitech",
 	    "Cordless mouse",
 	},
 	{
 	    USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_RB6,
 	    0,
-	    "Logitech, Inc.",
+	    "Logitech",
 	    "Cordless keyboard",
 	},
 	{
 	    USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QUICKCAMPRO2,
 	    0,
-	    "Logitech, Inc.",
+	    "Logitech",
 	    "QuickCam Pro",
 	},
 	{
@@ -1350,43 +1350,43 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_MCT, USB_PRODUCT_MCT_HUB0100,
 	    0,
-	    "MCT Corp.",
+	    "MCT",
 	    "Hub",
 	},
 	{
+	    USB_VENDOR_MCT, USB_PRODUCT_MCT_DU_H3SP_USB232,
+	    0,
+	    "MCT",
+	    "D-Link DU-H3SP USB BAY Hub",
+	},
+	{
 	    USB_VENDOR_MCT, USB_PRODUCT_MCT_USB232,
 	    0,
-	    "MCT Corp.",
+	    "MCT",
 	    "USB-232 Interface",
 	},
 	{
 	    USB_VENDOR_MCT, USB_PRODUCT_MCT_SITECOM_USB232,
 	    0,
-	    "MCT Corp.",
+	    "MCT",
 	    "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.",
+	    "Melco",
 	    "LUA-TX Ethernet",
 	},
 	{
 	    USB_VENDOR_MELCO, USB_PRODUCT_MELCO_LUATX5,
 	    0,
-	    "Melco, Inc.",
+	    "Melco",
 	    "LUA-TX Ethernet",
 	},
 	{
 	    USB_VENDOR_MELCO, USB_PRODUCT_MELCO_LUA2TX5,
 	    0,
-	    "Melco, Inc.",
+	    "Melco",
 	    "LUA2-TX Ethernet",
 	},
 	{
@@ -1530,55 +1530,55 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_MUSTEK, USB_PRODUCT_MUSTEK_1200CU,
 	    0,
-	    "Mustek Systems, Inc.",
+	    "Mustek Systems",
 	    "1200 CU scanner",
 	},
 	{
 	    USB_VENDOR_MUSTEK, USB_PRODUCT_MUSTEK_600CU,
 	    0,
-	    "Mustek Systems, Inc.",
+	    "Mustek Systems",
 	    "600 CU scanner",
 	},
 	{
 	    USB_VENDOR_MUSTEK, USB_PRODUCT_MUSTEK_1200USB,
 	    0,
-	    "Mustek Systems, Inc.",
+	    "Mustek Systems",
 	    "1200 USB scanner",
 	},
 	{
 	    USB_VENDOR_MUSTEK, USB_PRODUCT_MUSTEK_1200UB,
 	    0,
-	    "Mustek Systems, Inc.",
+	    "Mustek Systems",
 	    "1200 UB scanner",
 	},
 	{
 	    USB_VENDOR_MUSTEK, USB_PRODUCT_MUSTEK_1200USBPLUS,
 	    0,
-	    "Mustek Systems, Inc.",
+	    "Mustek Systems",
 	    "1200 USB Plus scanner",
 	},
 	{
 	    USB_VENDOR_MUSTEK, USB_PRODUCT_MUSTEK_1200CUPLUS,
 	    0,
-	    "Mustek Systems, Inc.",
+	    "Mustek Systems",
 	    "1200 CU Plus scanner",
 	},
 	{
 	    USB_VENDOR_MUSTEK, USB_PRODUCT_MUSTEK_BEARPAW1200F,
 	    0,
-	    "Mustek Systems, Inc.",
+	    "Mustek Systems",
 	    "BearPaw 1200F scanner",
 	},
 	{
 	    USB_VENDOR_MUSTEK, USB_PRODUCT_MUSTEK_600USB,
 	    0,
-	    "Mustek Systems, Inc.",
+	    "Mustek Systems",
 	    "600 USB scanner",
 	},
 	{
 	    USB_VENDOR_MUSTEK, USB_PRODUCT_MUSTEK_MDC800,
 	    0,
-	    "Mustek Systems, Inc.",
+	    "Mustek Systems",
 	    "MDC-800 digital camera",
 	},
 	{
@@ -1591,13 +1591,13 @@ struct usb_knowndev usb_knowndevs[] = {
 	    USB_VENDOR_NATIONAL, USB_PRODUCT_NATIONAL_BEARPAW1200,
 	    0,
 	    "National Semiconductor",
-	    "BearPaw 1200 scanner",
+	    "BearPaw 1200",
 	},
 	{
 	    USB_VENDOR_NATIONAL, USB_PRODUCT_NATIONAL_BEARPAW2400,
 	    0,
 	    "National Semiconductor",
-	    "BearPaw 2400 scanner",
+	    "BearPaw 2400",
 	},
 	{
 	    USB_VENDOR_NEC, USB_PRODUCT_NEC_HUB,
@@ -1620,7 +1620,7 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_NETGEAR, USB_PRODUCT_NETGEAR_EA101,
 	    0,
-	    "BayNETGEAR, Inc.",
+	    "BayNETGEAR",
 	    "Ethernet adapter",
 	},
 	{
@@ -1656,7 +1656,7 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_PALM, USB_PRODUCT_PALM_SERIAL,
 	    0,
-	    "Palm Computing, Inc.",
+	    "Palm Computing",
 	    "USB Serial Adaptor",
 	},
 	{
@@ -1668,25 +1668,25 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_PERACOM, USB_PRODUCT_PERACOM_SERIAL1,
 	    0,
-	    "Peracom Networks, Inc.",
+	    "Peracom Networks",
 	    "Serial Converter",
 	},
 	{
 	    USB_VENDOR_PERACOM, USB_PRODUCT_PERACOM_ENET,
 	    0,
-	    "Peracom Networks, Inc.",
+	    "Peracom Networks",
 	    "Ethernet adapter",
 	},
 	{
 	    USB_VENDOR_PERACOM, USB_PRODUCT_PERACOM_ENET3,
 	    0,
-	    "Peracom Networks, Inc.",
+	    "Peracom Networks",
 	    "At Home Ethernet Adapter",
 	},
 	{
 	    USB_VENDOR_PERACOM, USB_PRODUCT_PERACOM_ENET2,
 	    0,
-	    "Peracom Networks, Inc.",
+	    "Peracom Networks",
 	    "Ethernet adapter",
 	},
 	{
@@ -1842,49 +1842,49 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_PROLIFIC, USB_PRODUCT_PROLIFIC_PL2301,
 	    0,
-	    "Prolific Technology Inc.",
+	    "Prolific Technology",
 	    "PL2301 Host-Host interface",
 	},
 	{
 	    USB_VENDOR_PROLIFIC, USB_PRODUCT_PROLIFIC_PL2302,
 	    0,
-	    "Prolific Technology Inc.",
+	    "Prolific Technology",
 	    "PL2302 Host-Host interface",
 	},
 	{
 	    USB_VENDOR_PROLIFIC, USB_PRODUCT_PROLIFIC_RSAQ2,
 	    0,
-	    "Prolific Technology Inc.",
+	    "Prolific Technology",
 	    "PL2303 Serial adapter (IODATA USB-RSAQ2)",
 	},
 	{
 	    USB_VENDOR_PROLIFIC, USB_PRODUCT_PROLIFIC_PL2303,
 	    0,
-	    "Prolific Technology Inc.",
+	    "Prolific Technology",
 	    "PL2303 Serial adapter (ATEN/IOGEAR UC232A)",
 	},
 	{
 	    USB_VENDOR_PROLIFIC, USB_PRODUCT_PROLIFIC_PL2305,
 	    0,
-	    "Prolific Technology Inc.",
+	    "Prolific Technology",
 	    "Parallel printer adapter",
 	},
 	{
 	    USB_VENDOR_PROLIFIC, USB_PRODUCT_PROLIFIC_ATAPI4,
 	    0,
-	    "Prolific Technology Inc.",
+	    "Prolific Technology",
 	    "ATAPI-4 Bridge Controller",
 	},
 	{
 	    USB_VENDOR_PUTERCOM, USB_PRODUCT_PUTERCOM_UPA100,
 	    0,
-	    "Putercom Co., Ltd.",
+	    "Putercom",
 	    "USB-1284 BRIDGE",
 	},
 	{
 	    USB_VENDOR_QTRONIX, USB_PRODUCT_QTRONIX_980N,
 	    0,
-	    "Qtronix Corp",
+	    "Qtronix",
 	    "Scorpion-980N keyboard",
 	},
 	{
@@ -1902,7 +1902,7 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_ROLAND, USB_PRODUCT_ROLAND_UM1,
 	    0,
-	    "Roland Corp.",
+	    "Roland",
 	    "UM-1 MIDI I/F",
 	},
 	{
@@ -1938,7 +1938,7 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_SCANLOGIC, USB_PRODUCT_SCANLOGIC_336CX,
 	    0,
-	    "ScanLogic Corp.",
+	    "ScanLogic",
 	    "Phantom 336CX - C3 scanner",
 	},
 	{
@@ -2010,13 +2010,13 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_SILICONPORTALS, USB_PRODUCT_SILICONPORTALS_YAPPH_NF,
 	    0,
-	    "Silicon Portals Inc.",
+	    "Silicon Portals",
 	    "YAP Phone (no firmware)",
 	},
 	{
 	    USB_VENDOR_SILICONPORTALS, USB_PRODUCT_SILICONPORTALS_YAPPHONE,
 	    0,
-	    "Silicon Portals Inc.",
+	    "Silicon Portals",
 	    "YAP Phone",
 	},
 	{
@@ -2028,19 +2028,19 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_SMARTBRIDGES, USB_PRODUCT_SMARTBRIDGES_SMARTLINK,
 	    0,
-	    "SmartBridges Pte Ltd.",
+	    "SmartBridges",
 	    "SmartLink USB ethernet adapter",
 	},
 	{
 	    USB_VENDOR_SMC, USB_PRODUCT_SMC_2102USB,
 	    0,
-	    "Standard Microsystems Corp",
+	    "Standard Microsystems",
 	    "10Mbps ethernet adapter",
 	},
 	{
 	    USB_VENDOR_SMC, USB_PRODUCT_SMC_2202USB,
 	    0,
-	    "Standard Microsystems Corp",
+	    "Standard Microsystems",
 	    "10/100 ethernet adapter",
 	},
 	{
@@ -2052,19 +2052,19 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_SONY, USB_PRODUCT_SONY_DSC,
 	    0,
-	    "Sony Corp.",
+	    "Sony",
 	    "DSC cameras",
 	},
 	{
 	    USB_VENDOR_SONY, USB_PRODUCT_SONY_MSACUS1,
 	    0,
-	    "Sony Corp.",
+	    "Sony",
 	    "Memorystick MSAC-US1",
 	},
 	{
 	    USB_VENDOR_SONY, USB_PRODUCT_SONY_MSC,
 	    0,
-	    "Sony Corp.",
+	    "Sony",
 	    "MSC memory stick slot",
 	},
 	{
@@ -2124,25 +2124,25 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_TDK, USB_PRODUCT_TDK_UPA9664,
 	    0,
-	    "TDK Corp.",
+	    "TDK",
 	    "USB-PDC Adapter UPA9664",
 	},
 	{
 	    USB_VENDOR_TDK, USB_PRODUCT_TDK_UCA1464,
 	    0,
-	    "TDK Corp.",
+	    "TDK",
 	    "USB-cdmaOne Adapter UCA1464",
 	},
 	{
 	    USB_VENDOR_TDK, USB_PRODUCT_TDK_UHA6400,
 	    0,
-	    "TDK Corp.",
+	    "TDK",
 	    "USB-PHS Adapter UHA6400",
 	},
 	{
 	    USB_VENDOR_TDK, USB_PRODUCT_TDK_UPA6400,
 	    0,
-	    "TDK Corp.",
+	    "TDK",
 	    "USB-PHS Adapter UPA6400",
 	},
 	{
@@ -2154,7 +2154,7 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_TELEX, USB_PRODUCT_TELEX_MIC1,
 	    0,
-	    "Telex Communications, Inc.",
+	    "Telex Communications",
 	    "Enhanced USB Microphone",
 	},
 	{
@@ -2190,31 +2190,31 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_UMAX, USB_PRODUCT_UMAX_ASTRA1236U,
 	    0,
-	    "UMAX Data Systems, Inc.",
+	    "UMAX Data Systems",
 	    "Astra 1236U Scanner",
 	},
 	{
 	    USB_VENDOR_UMAX, USB_PRODUCT_UMAX_ASTRA1220U,
 	    0,
-	    "UMAX Data Systems, Inc.",
+	    "UMAX Data Systems",
 	    "Astra 1220U Scanner",
 	},
 	{
 	    USB_VENDOR_UMAX, USB_PRODUCT_UMAX_ASTRA2000U,
 	    0,
-	    "UMAX Data Systems, Inc.",
+	    "UMAX Data Systems",
 	    "Astra 2000U Scanner",
 	},
 	{
 	    USB_VENDOR_UMAX, USB_PRODUCT_UMAX_ASTRA2100U,
 	    0,
-	    "UMAX Data Systems, Inc.",
+	    "UMAX Data Systems",
 	    "Astra 2100U Scanner",
 	},
 	{
 	    USB_VENDOR_UMAX, USB_PRODUCT_UMAX_ASTRA2200U,
 	    0,
-	    "UMAX Data Systems, Inc.",
+	    "UMAX Data Systems",
 	    "Astra 2200U Scanner",
 	},
 	{
@@ -2226,7 +2226,7 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_VISION, USB_PRODUCT_VISION_VC6452V002,
 	    0,
-	    "VLSI Vision Ltd.",
+	    "VLSI Vision",
 	    "CPiA Camera",
 	},
 	{
@@ -2268,25 +2268,25 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_WACOM, USB_PRODUCT_WACOM_CT0405U,
 	    0,
-	    "WACOM Corp. Ltd.",
+	    "WACOM",
 	    "CT-0405-U Tablet",
 	},
 	{
 	    USB_VENDOR_WACOM, USB_PRODUCT_WACOM_GRAPHIRE,
 	    0,
-	    "WACOM Corp. Ltd.",
+	    "WACOM",
 	    "Graphire",
 	},
 	{
 	    USB_VENDOR_WACOM, USB_PRODUCT_WACOM_INTUOSA5,
 	    0,
-	    "WACOM Corp. Ltd.",
+	    "WACOM",
 	    "Intuos A5",
 	},
 	{
 	    USB_VENDOR_XIRLINK, USB_PRODUCT_XIRLINK_PCCAM,
 	    0,
-	    "Xirlink, Inc.",
+	    "Xirlink",
 	    "IBM PC Camera",
 	},
 	{
@@ -2304,43 +2304,43 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_UX256,
 	    0,
-	    "YAMAHA Corp.",
+	    "YAMAHA",
 	    "UX256 MIDI I/F",
 	},
 	{
 	    USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_UX96,
 	    0,
-	    "YAMAHA Corp.",
+	    "YAMAHA",
 	    "UX96 MIDI I/F",
 	},
 	{
 	    USB_VENDOR_ZOOM, USB_PRODUCT_ZOOM_2986L,
 	    0,
-	    "Zoom Telephonics, Inc.",
+	    "Zoom Telephonics",
 	    "2986L Fax modem",
 	},
 	{
 	    USB_VENDOR_ZYXEL, USB_PRODUCT_ZYXEL_OMNI56K,
 	    0,
-	    "ZyXEL Communication Co.",
+	    "ZyXEL Communication",
 	    "Omni 56K Plus",
 	},
 	{
 	    USB_VENDOR_ZYXEL, USB_PRODUCT_ZYXEL_980N,
 	    0,
-	    "ZyXEL Communication Co.",
+	    "ZyXEL Communication",
 	    "Scorpion-980N keyboard",
 	},
 	{
 	    USB_VENDOR_AOX, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "AOX, Inc.",
+	    "AOX",
 	    NULL,
 	},
 	{
 	    USB_VENDOR_ATMEL, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Atmel Corp.",
+	    "Atmel",
 	    NULL,
 	},
 	{
@@ -2352,13 +2352,13 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_HP, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Hewlett-Packard",
+	    "Hewlett Packard",
 	    NULL,
 	},
 	{
 	    USB_VENDOR_ADAPTEC, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Adaptec, Inc.",
+	    "Adaptec",
 	    NULL,
 	},
 	{
@@ -2370,7 +2370,7 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_ACERLABS, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Acer Labs, Inc.",
+	    "Acer Labs",
 	    NULL,
 	},
 	{
@@ -2388,13 +2388,13 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_KODAK, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Eastman Kodak Corp.",
+	    "Eastman Kodak",
 	    NULL,
 	},
 	{
 	    USB_VENDOR_MELCO, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Melco, Inc.",
+	    "Melco",
 	    NULL,
 	},
 	{
@@ -2406,19 +2406,19 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_ADI, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "ADI Systems, Inc.",
+	    "ADI Systems",
 	    NULL,
 	},
 	{
 	    USB_VENDOR_CATC, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Computer Access Technology Corp.",
+	    "Computer Access Technology",
 	    NULL,
 	},
 	{
 	    USB_VENDOR_GRAVIS, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Advanced Gravis Computer Tech. Ltd.",
+	    "Advanced Gravis Computer Tech.",
 	    NULL,
 	},
 	{
@@ -2442,19 +2442,19 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_LEXMARK, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Lexmark International, Inc.",
+	    "Lexmark International",
 	    NULL,
 	},
 	{
 	    USB_VENDOR_NANAO, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "NANAO Corp.",
+	    "NANAO",
 	    NULL,
 	},
 	{
 	    USB_VENDOR_ALPS, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Alps Electric Co., Ltd.",
+	    "Alps Electric",
 	    NULL,
 	},
 	{
@@ -2472,13 +2472,13 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_ANALOGDEVICES, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Analog Devices, Inc.",
+	    "Analog Devices",
 	    NULL,
 	},
 	{
 	    USB_VENDOR_KYE, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "KYE Systems Corp.",
+	    "KYE Systems",
 	    NULL,
 	},
 	{
@@ -2502,13 +2502,13 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_AMP, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "AMP, Inc.",
+	    "AMP",
 	    NULL,
 	},
 	{
 	    USB_VENDOR_CHERRY, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Cherry Mikroschalter GmbH",
+	    "Cherry Mikroschalter",
 	    NULL,
 	},
 	{
@@ -2520,7 +2520,7 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_LOGITECH, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Logitech, Inc.",
+	    "Logitech",
 	    NULL,
 	},
 	{
@@ -2538,7 +2538,7 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_CONNECTIX, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Connectix Corp.",
+	    "Connectix",
 	    NULL,
 	},
 	{
@@ -2562,7 +2562,7 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_YAMAHA, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "YAMAHA Corp.",
+	    "YAMAHA",
 	    NULL,
 	},
 	{
@@ -2574,7 +2574,7 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_ACERP, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Acer Peripherals, Inc.",
+	    "Acer Peripherals",
 	    NULL,
 	},
 	{
@@ -2586,7 +2586,7 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_CANON, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Canon, Inc.",
+	    "Canon",
 	    NULL,
 	},
 	{
@@ -2610,7 +2610,7 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_EPSON, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Seiko Epson Corp.",
+	    "Seiko Epson",
 	    NULL,
 	},
 	{
@@ -2628,7 +2628,7 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_TDK, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "TDK Corp.",
+	    "TDK",
 	    NULL,
 	},
 	{
@@ -2640,13 +2640,13 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_METHODE, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Methode Electronics Far East PTE Ltd.",
+	    "Methode Electronics Far East",
 	    NULL,
 	},
 	{
 	    USB_VENDOR_MAXISWITCH, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Maxi Switch, Inc.",
+	    "Maxi Switch",
 	    NULL,
 	},
 	{
@@ -2658,7 +2658,7 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_FUJITSU, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Fujitsu Ltd.",
+	    "Fujitsu",
 	    NULL,
 	},
 	{
@@ -2676,19 +2676,19 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_KONICA, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Konica Corp.",
+	    "Konica",
 	    NULL,
 	},
 	{
 	    USB_VENDOR_LITEON, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Lite-On Technology Corp.",
+	    "Lite-On Technology",
 	    NULL,
 	},
 	{
 	    USB_VENDOR_FUJIPHOTO, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Fuji Photo Film Co., Ltd.",
+	    "Fuji Photo Film",
 	    NULL,
 	},
 	{
@@ -2706,13 +2706,13 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_SCANLOGIC, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "ScanLogic Corp.",
+	    "ScanLogic",
 	    NULL,
 	},
 	{
 	    USB_VENDOR_MYSON, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Myson Technology Inc.",
+	    "Myson Technology",
 	    NULL,
 	},
 	{
@@ -2730,7 +2730,7 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_ALTEC, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Altec Lansing Technologies, Inc.",
+	    "Altec Lansing Technologies",
 	    NULL,
 	},
 	{
@@ -2740,6 +2740,12 @@ struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_IIYAMA, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Iiyama",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_SHUTTLE, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "Shuttle Technology",
@@ -2754,13 +2760,13 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_CHICONY, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Chicony Electronics Co., Ltd.",
+	    "Chicony Electronics",
 	    NULL,
 	},
 	{
 	    USB_VENDOR_BROTHER, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Brother Industries, Ltd.",
+	    "Brother Industries",
 	    NULL,
 	},
 	{
@@ -2772,19 +2778,19 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_ACER, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Acer, Inc.",
+	    "Acer",
 	    NULL,
 	},
 	{
 	    USB_VENDOR_3COM, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "3Com Corp.",
+	    "3Com",
 	    NULL,
 	},
 	{
 	    USB_VENDOR_AZTECH, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Aztech Systems Ltd",
+	    "Aztech Systems",
 	    NULL,
 	},
 	{
@@ -2796,7 +2802,7 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_KAWATSU, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Kawatsu Semiconductor, Inc.",
+	    "Kawatsu Semiconductor",
 	    NULL,
 	},
 	{
@@ -2808,7 +2814,7 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_CONNECTEK, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Advanced Connectek USA, Inc.",
+	    "Advanced Connectek USA",
 	    NULL,
 	},
 	{
@@ -2826,7 +2832,7 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_ATI, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "ATI Technologies, Inc.",
+	    "ATI Technologies",
 	    NULL,
 	},
 	{
@@ -2844,67 +2850,67 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_XIRLINK, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Xirlink, Inc.",
+	    "Xirlink",
 	    NULL,
 	},
 	{
 	    USB_VENDOR_ANCHOR, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Anchor Chips, Inc.",
+	    "Anchor Chips",
 	    NULL,
 	},
 	{
 	    USB_VENDOR_SONY, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Sony Corp.",
+	    "Sony",
 	    NULL,
 	},
 	{
 	    USB_VENDOR_VISION, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "VLSI Vision Ltd.",
+	    "VLSI Vision",
 	    NULL,
 	},
 	{
 	    USB_VENDOR_ASAHIKASEI, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Asahi Kasei Microsystems Co., Ltd",
+	    "Asahi Kasei Microsystems",
 	    NULL,
 	},
 	{
 	    USB_VENDOR_ATEN, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "ATEN International Co. Ltd.",
+	    "ATEN International",
 	    NULL,
 	},
 	{
 	    USB_VENDOR_MUSTEK, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Mustek Systems, Inc.",
+	    "Mustek Systems",
 	    NULL,
 	},
 	{
 	    USB_VENDOR_TELEX, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Telex Communications, Inc.",
+	    "Telex Communications",
 	    NULL,
 	},
 	{
 	    USB_VENDOR_PERACOM, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Peracom Networks, Inc.",
+	    "Peracom Networks",
 	    NULL,
 	},
 	{
 	    USB_VENDOR_ALCOR2, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Alcor Micro, Inc.",
+	    "Alcor Micro",
 	    NULL,
 	},
 	{
 	    USB_VENDOR_WACOM, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "WACOM Corp. Ltd.",
+	    "WACOM",
 	    NULL,
 	},
 	{
@@ -2922,7 +2928,7 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_ELECOM, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Elecom Corp. Ltd.",
+	    "Elecom",
 	    NULL,
 	},
 	{
@@ -2958,7 +2964,7 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_ROLAND, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Roland Corp.",
+	    "Roland",
 	    NULL,
 	},
 	{
@@ -2968,27 +2974,33 @@ struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_RATOC, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "RATOC Systems,Inc.",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_ZYXEL, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "ZyXEL Communication Co.",
+	    "ZyXEL Communication",
 	    NULL,
 	},
 	{
 	    USB_VENDOR_ALCOR, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Alcor Micro, Inc.",
+	    "Alcor Micro",
 	    NULL,
 	},
 	{
 	    USB_VENDOR_IOMEGA, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Iomega Corp.",
+	    "Iomega",
 	    NULL,
 	},
 	{
 	    USB_VENDOR_ATREND, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "A-Trend Technology Co., Ltd.",
+	    "A-Trend Technology",
 	    NULL,
 	},
 	{
@@ -3030,13 +3042,13 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_QTRONIX, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Qtronix Corp",
+	    "Qtronix",
 	    NULL,
 	},
 	{
 	    USB_VENDOR_ELSA, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "ELSA Gmbh",
+	    "ELSA",
 	    NULL,
 	},
 	{
@@ -3078,13 +3090,13 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_GENESYS, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Genesys Logic, Inc.",
+	    "Genesys Logic",
 	    NULL,
 	},
 	{
 	    USB_VENDOR_FUJI, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Fuji Electric Co., Ltd.",
+	    "Fuji Electric",
 	    NULL,
 	},
 	{
@@ -3108,13 +3120,13 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_FFC, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "FFC Limited",
+	    "FFC",
 	    NULL,
 	},
 	{
 	    USB_VENDOR_ANKO, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Anko Electronic Co., Ltd.",
+	    "Anko Electronic",
 	    NULL,
 	},
 	{
@@ -3144,7 +3156,7 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_BRIDGE, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Bridge Information Co., Ltd.",
+	    "Bridge Information",
 	    NULL,
 	},
 	{
@@ -3168,25 +3180,25 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_ACTLABS, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Act Labs, Ltd.",
+	    "Act Labs",
 	    NULL,
 	},
 	{
 	    USB_VENDOR_ALARIS, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Alaris, Inc.",
+	    "Alaris",
 	    NULL,
 	},
 	{
 	    USB_VENDOR_APEX, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Apex, Inc.",
+	    "Apex",
 	    NULL,
 	},
 	{
 	    USB_VENDOR_AVISION, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Avision, Inc.",
+	    "Avision",
 	    NULL,
 	},
 	{
@@ -3198,37 +3210,43 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_LINKSYS, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Linksys, Inc.",
+	    "Linksys",
 	    NULL,
 	},
 	{
 	    USB_VENDOR_ACERSA, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Acer Semiconductor America, Inc.",
+	    "Acer Semiconductor America",
+	    NULL,
+	},
+	{
+	    USB_VENDOR_SIGMATEL, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Sigmatel",
 	    NULL,
 	},
 	{
 	    USB_VENDOR_AIWA, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Aiwa Co., Ltd.",
+	    "Aiwa",
 	    NULL,
 	},
 	{
 	    USB_VENDOR_ACARD, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "ACARD Technology Corp.",
+	    "ACARD Technology",
 	    NULL,
 	},
 	{
 	    USB_VENDOR_PROLIFIC, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Prolific Technology Inc.",
+	    "Prolific Technology",
 	    NULL,
 	},
 	{
 	    USB_VENDOR_ADVANCELOGIC, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Avance Logic, Inc.",
+	    "Avance Logic",
 	    NULL,
 	},
 	{
@@ -3246,7 +3264,13 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_ASKEY, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Askey Computer Corp.",
+	    "Askey Computer",
+	    NULL,
+	},
+	{
+	    USB_VENDOR_SAITEK, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Saitek",
 	    NULL,
 	},
 	{
@@ -3258,19 +3282,19 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_AGFA, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "AGFA-Gevaert NV",
+	    "AGFA-Gevaert",
 	    NULL,
 	},
 	{
 	    USB_VENDOR_ASIAMD, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Asia Microelectronic Development, Inc.",
+	    "Asia Microelectronic Development",
 	    NULL,
 	},
 	{
 	    USB_VENDOR_BIZLINK, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Bizlink International Corp.",
+	    "Bizlink International",
 	    NULL,
 	},
 	{
@@ -3282,7 +3306,7 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_AASHIMA, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Aashima Technology B.V.",
+	    "Aashima Technology",
 	    NULL,
 	},
 	{
@@ -3294,7 +3318,7 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_ADS, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "ADS Technologies, Inc.",
+	    "ADS Technologies",
 	    NULL,
 	},
 	{
@@ -3318,19 +3342,25 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_SMC, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Standard Microsystems Corp",
+	    "Standard Microsystems",
 	    NULL,
 	},
 	{
 	    USB_VENDOR_PUTERCOM, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Putercom Co., Ltd.",
+	    "Putercom",
 	    NULL,
 	},
 	{
 	    USB_VENDOR_MCT, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "MCT Corp.",
+	    "MCT",
+	    NULL,
+	},
+	{
+	    USB_VENDOR_DIGITALSTREAM, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Digital Stream",
 	    NULL,
 	},
 	{
@@ -3348,7 +3378,7 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_GRIFFIN, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Griffin Technology, Inc.",
+	    "Griffin Technology",
 	    NULL,
 	},
 	{
@@ -3360,25 +3390,25 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_BRIMAX, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Brimax, Inc.",
+	    "Brimax",
 	    NULL,
 	},
 	{
 	    USB_VENDOR_AXIS, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Axis Communications AB",
+	    "Axis Communications",
 	    NULL,
 	},
 	{
 	    USB_VENDOR_ABL, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "ABL Electronics Corp.",
+	    "ABL Electronics",
 	    NULL,
 	},
 	{
 	    USB_VENDOR_ALFADATA, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Alfadata Computer Corp.",
+	    "Alfadata Computer",
 	    NULL,
 	},
 	{
@@ -3390,19 +3420,19 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_ONNTO, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Onnto Corp.",
+	    "Onnto",
 	    NULL,
 	},
 	{
 	    USB_VENDOR_BE, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Be, Inc.",
+	    "Be",
 	    NULL,
 	},
 	{
 	    USB_VENDOR_ADMTEK, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "ADMtek, Inc.",
+	    "ADMtek",
 	    NULL,
 	},
 	{
@@ -3432,13 +3462,13 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_ABOCOM, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "AboCom Systems, Inc.",
+	    "AboCom Systems",
 	    NULL,
 	},
 	{
 	    USB_VENDOR_KEISOKUGIKEN, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Keisokugiken Corp.",
+	    "Keisokugiken",
 	    NULL,
 	},
 	{
@@ -3450,7 +3480,7 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_BUG, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "B.U.G., Inc.",
+	    "B.U.G.",
 	    NULL,
 	},
 	{
@@ -3462,7 +3492,7 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_AVERMEDIA, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "AVerMedia Technologies, Inc.",
+	    "AVerMedia Technologies",
 	    NULL,
 	},
 	{
@@ -3480,7 +3510,7 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_APTIO, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Aptio Products, Inc.",
+	    "Aptio Products",
 	    NULL,
 	},
 	{
@@ -3492,7 +3522,7 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_ALLIEDCABLE, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Allied Cable Corp.",
+	    "Allied Cable",
 	    NULL,
 	},
 	{
@@ -3504,37 +3534,37 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_ZOOM, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Zoom Telephonics, Inc.",
+	    "Zoom Telephonics",
 	    NULL,
 	},
 	{
 	    USB_VENDOR_BROADLOGIC, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "BroadLogic, Inc.",
+	    "BroadLogic",
 	    NULL,
 	},
 	{
 	    USB_VENDOR_HANDSPRING, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Handspring, Inc.",
+	    "Handspring",
 	    NULL,
 	},
 	{
 	    USB_VENDOR_ACTIONSTAR, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Action Star Enterprise Co., Ltd.",
+	    "Action Star Enterprise",
 	    NULL,
 	},
 	{
 	    USB_VENDOR_PALM, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Palm Computing, Inc.",
+	    "Palm Computing",
 	    NULL,
 	},
 	{
 	    USB_VENDOR_ACCTON, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Accton Technology Corp.",
+	    "Accton Technology",
 	    NULL,
 	},
 	{
@@ -3546,13 +3576,19 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_NETGEAR, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "BayNETGEAR, Inc.",
+	    "BayNETGEAR",
 	    NULL,
 	},
 	{
 	    USB_VENDOR_ACTIVEWIRE, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "ActiveWire, Inc.",
+	    "ActiveWire",
+	    NULL,
+	},
+	{
+	    USB_VENDOR_PORTGEAR, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "PortGear",
 	    NULL,
 	},
 	{
@@ -3564,19 +3600,25 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_ADESSOKBTEK, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "ADESSO/Kbtek America, Inc.",
+	    "ADESSO/Kbtek America",
+	    NULL,
+	},
+	{
+	    USB_VENDOR_JATON, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Jaton",
 	    NULL,
 	},
 	{
 	    USB_VENDOR_APT, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "APT Technologies, Inc.",
+	    "APT Technologies",
 	    NULL,
 	},
 	{
 	    USB_VENDOR_BOCARESEARCH, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Boca Research, Inc.",
+	    "Boca Research",
 	    NULL,
 	},
 	{
@@ -3588,37 +3630,37 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_BURRBROWN, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Burr-Brown Japan, Ltd.",
+	    "Burr-Brown Japan",
 	    NULL,
 	},
 	{
 	    USB_VENDOR_2WIRE, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "2Wire, Inc",
+	    "2Wire",
 	    NULL,
 	},
 	{
 	    USB_VENDOR_AIPTEK, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "AIPTEK International, Inc.",
+	    "AIPTEK International",
 	    NULL,
 	},
 	{
 	    USB_VENDOR_SMARTBRIDGES, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "SmartBridges Pte Ltd.",
+	    "SmartBridges",
 	    NULL,
 	},
 	{
 	    USB_VENDOR_BILLIONTON, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Billionton Systems, Inc.",
+	    "Billionton Systems",
 	    NULL,
 	},
 	{
 	    USB_VENDOR_EXTENDED, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Extended Systems, Inc.",
+	    "Extended Systems",
 	    NULL,
 	},
 	{
@@ -3630,13 +3672,13 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_AUTHENTEC, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "AuthenTec, Inc.",
+	    "AuthenTec",
 	    NULL,
 	},
 	{
 	    USB_VENDOR_ALATION, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Alation Systems, Inc.",
+	    "Alation Systems",
 	    NULL,
 	},
 	{
@@ -3660,13 +3702,19 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_BLUEWATER, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "BlueWater Systems, Inc.",
+	    "BlueWater Systems",
 	    NULL,
 	},
 	{
 	    USB_VENDOR_AGILENT, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Agilent Technologies, Inc.",
+	    "Agilent Technologies",
+	    NULL,
+	},
+	{
+	    USB_VENDOR_PORTSMITH, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Portsmith",
 	    NULL,
 	},
 	{
@@ -3678,55 +3726,55 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_BECKHOFF, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Beckhoff Gmbh",
+	    "Beckhoff",
 	    NULL,
 	},
 	{
 	    USB_VENDOR_ALTIUS, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Altius Solutions, Inc.",
+	    "Altius Solutions",
 	    NULL,
 	},
 	{
 	    USB_VENDOR_ARRIS, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Arris Interactive LLC",
+	    "Arris Interactive",
 	    NULL,
 	},
 	{
 	    USB_VENDOR_ACTIVCARD, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "ACTIVCARD, INC.",
+	    "ACTIVCARD",
 	    NULL,
 	},
 	{
 	    USB_VENDOR_ACTISYS, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "ACTiSYS Corp.",
+	    "ACTiSYS",
 	    NULL,
 	},
 	{
 	    USB_VENDOR_AFOURTECH, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "A-FOUR TECH CO., LTD.",
+	    "A-FOUR TECH",
 	    NULL,
 	},
 	{
 	    USB_VENDOR_AIMEX, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "AIMEX Corp.",
+	    "AIMEX",
 	    NULL,
 	},
 	{
 	    USB_VENDOR_ADDONICS, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Addonics Technologies Corp.",
+	    "Addonics Technologies",
 	    NULL,
 	},
 	{
 	    USB_VENDOR_AKAI, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "AKAI professional M.I. Corp.",
+	    "AKAI professional M.I.",
 	    NULL,
 	},
 	{
@@ -3756,25 +3804,25 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_ASAHIOPTICAL, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Asahi Optical Co., Ltd.",
+	    "Asahi Optical",
 	    NULL,
 	},
 	{
 	    USB_VENDOR_BOCASYSTEMS, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Boca Systems, Inc.",
+	    "Boca Systems",
 	    NULL,
 	},
 	{
 	    USB_VENDOR_BROADCOM, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Broadcom Corp.",
+	    "Broadcom",
 	    NULL,
 	},
 	{
 	    USB_VENDOR_GREENHOUSE, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "GREENHOUSE Co., Ltd.",
+	    "GREENHOUSE",
 	    NULL,
 	},
 	{
@@ -3784,12 +3832,36 @@ struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_TODOS, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Todos Data System",
+	    NULL,
+	},
+	{
+	    USB_VENDOR_NEC2, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "NEC",
+	    NULL,
+	},
+	{
+	    USB_VENDOR_ATI2, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "ATI",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_AGATE, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "Agate Technologies",
 	    NULL,
 	},
 	{
+	    USB_VENDOR_DMI, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "DMI",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_MOTOROLA, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "Motorola",
@@ -3802,21 +3874,45 @@ struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_ASANTE, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Asante",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_BELKIN2, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Belkin Components (2nd)",
+	    "Belkin Components",
+	    NULL,
+	},
+	{
+	    USB_VENDOR_MOBILITY, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Mobility",
+	    NULL,
+	},
+	{
+	    USB_VENDOR_SHARK, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Shark",
 	    NULL,
 	},
 	{
 	    USB_VENDOR_SILICONPORTALS, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Silicon Portals Inc.",
+	    "Silicon Portals",
+	    NULL,
+	},
+	{
+	    USB_VENDOR_SOHOWARE, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "SOHOware",
 	    NULL,
 	},
 	{
 	    USB_VENDOR_UMAX, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "UMAX Data Systems, Inc.",
+	    "UMAX Data Systems",
 	    NULL,
 	},
 	{
@@ -3834,13 +3930,13 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_ACTIONTEC, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Actiontec Electronics, Inc.",
+	    "Actiontec Electronics",
 	    NULL,
 	},
 	{
 	    USB_VENDOR_DLINK, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "D-Link Corp",
+	    "D-Link",
 	    NULL,
 	},
 	{
@@ -3858,7 +3954,7 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_HP2, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Hewlett-Packard",
+	    "Hewlett Packard",
 	    NULL,
 	},
 	{ 0, 0, 0, NULL, NULL, }