Merge in a bunch of USB device and manufacturer definitions..

Submitted by:	barry bouwsma (freebsd-misuser@NOSPAM.dyndns.dk)
Obtained from:	Dragonfly
MFC after:	3 days

1 files changed, 97 insertions, 75 deletions

diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs
index 9c801cb..6ef20f9 100644
--- a/sys/dev/usb/usbdevs
+++ b/sys/dev/usb/usbdevs
@@ -60,18 +60,35 @@ $FreeBSD$
  * make the device recognised by the appropriate device driver.
  */
 
+vendor LTS		0x0386	LTS
 vendor AOX		0x03e8	AOX
+vendor THESYS		0x03e9	Thesys Microelectronics
+vendor DATABROADCAST	0x03ea	Data Broadcasting Corp.
 vendor ATMEL		0x03eb	Atmel
+vendor IWATSU		0x03ec	Iwatsu America, Inc.
+vendor MITEL		0x03ee	Mitel Corp.
 vendor MITSUMI		0x03ee	Mitsumi
 vendor HP		0x03f0	Hewlett Packard
+vendor GENOA		0x03f1	Genoa Technology
 vendor OAK		0x03f2	Oak Technology
 vendor ADAPTEC		0x03f3	Adaptec
 vendor DIEBOLD		0x03f4	Diebold
+vendor SIEMENSELECTRO	0x03f5	Siemens Electromechanical
+vendor EPSONIMAGING	0x03f8	Epson Imaging Technology Center
 vendor KEYTRONIC	0x03f9	KeyTronic
+vendor OPTI		0x03fb	OPTi, Inc.
 vendor ELITEGROUP	0x03fc	Elitegroup Computer Systems
+vendor XILINX		0x03fd	Xilinx, Inc.
+vendor FARALLON		0x03fe	Farallon Communications
 vendor NATIONAL		0x0400	National Semiconductor
+vendor NATIONALREG	0x0401	National Registry, Inc.
 vendor ACERLABS		0x0402	Acer Labs
 vendor FTDI		0x0403	Future Technology Devices
+vendor NCR		0x0404	NCR Corp.
+vendor SYNOPSYS2	0x0405	Synopsys, Inc.
+vendor FUJITSUICL	0x0406	Fujitsu-ICL Computers
+vendor FUJITSU2		0x0407	Fujitsu Personal Systems, Inc.
+vendor QUANTA		0x0408	Quanta Computer, Inc.
 vendor NEC		0x0409	NEC
 vendor KODAK		0x040a	Eastman Kodak
 vendor WELTREND		0x040b	Weltrend Semiconductor
@@ -90,9 +107,9 @@ vendor GRAVIS		0x0428	Advanced Gravis Computer Tech.
 vendor CIRRUSLOGIC	0x0429	Cirrus Logic
 vendor INNOVATIVE	0x042c	Innovative Semiconductors
 vendor MOLEX		0x042f	Molex
-vendor SUN2		0x0430	Sun Microsystems (unoffical)
+vendor SUN2		0x0430	Sun Microsystems (unofficial)
 vendor UNISYS		0x0432	Unisys
-vendor TAUGA		0x0436  Taugagreining HF
+vendor TAUGA		0x0436	Taugagreining HF
 vendor AMD		0x0438	Advanced Micro Devices
 vendor LEXMARK		0x043d	Lexmark International
 vendor LG		0x043e	LG Electronics USA
@@ -299,7 +316,7 @@ vendor ACARD		0x0678	ACARD Technology
 vendor PROLIFIC		0x067b	Prolific Technology
 vendor SIEMENS		0x067c	Siemens
 vendor ADVANCELOGIC	0x0680	Avance Logic
-vendor HAGIWARA		0x0693  Hagiwara Sys-Com
+vendor HAGIWARA		0x0693	Hagiwara Sys-Com
 vendor MINOLTA		0x0686	Minolta
 vendor CTX		0x0698	Chuntex
 vendor ASKEY		0x069a	Askey Computer
@@ -358,7 +375,7 @@ vendor HANDSPRING	0x082d	Handspring
 vendor ACTIONSTAR	0x0835	Action Star Enterprise
 vendor PALM		0x0830	Palm Computing
 vendor SOURCENEXT	0x0833	SOURCENEXT
-vendor SAMSUNG_TECHWIN	0x0839  Samsung Techwin
+vendor SAMSUNG_TECHWIN	0x0839	Samsung Techwin
 vendor ACCTON		0x083a	Accton Technology
 vendor DIAMOND		0x0841	Diamond
 vendor NETGEAR		0x0846	BayNETGEAR
@@ -385,7 +402,7 @@ vendor ALATION		0x0910	Alation Systems
 vendor GOHUBS		0x0921	GoHubs
 vendor BIOMETRIC	0x0929	American Biometric Company
 vendor TOSHIBA		0x0930	Toshiba Corporation
-vendor PLEXTOR		0x093b  Plextor Corp.
+vendor PLEXTOR		0x093b	Plextor Corp.
 vendor INTREPIDCS	0x093c	Intrepid Control Systems
 vendor YANO		0x094f	Yano
 vendor KINGSTON		0x0951	Kingston Technology
@@ -413,7 +430,7 @@ vendor BOCASYSTEMS	0x0a43	Boca Systems
 vendor BROADCOM		0x0a5c	Broadcom
 vendor GREENHOUSE	0x0a6b	GREENHOUSE
 vendor GEOCAST		0x0a79	Geocast Network Systems
-vendor NEODIO		0x0aec  Neodio
+vendor NEODIO		0x0aec	Neodio
 vendor VODAFONE		0x0af0	Vodafone
 vendor TODOS		0x0b0c	Todos Data System
 vendor SIIG2		0x0b39	SIIG
@@ -426,7 +443,7 @@ vendor REALTEK		0x0bda	RealTek
 vendor AGATE		0x0c08	Agate Technologies
 vendor DMI		0x0c0b	DMI
 vendor LUWEN		0x0c76	Luwen
-vendor SMC3		0x0d5c  Standard Microsystems
+vendor SMC3		0x0d5c	Standard Microsystems
 vendor PNY		0x0d7d	PNY
 vendor MSI		0x0db0	Micro Star International
 vendor HAWKING		0x0e66	Hawking Technologies
@@ -508,7 +525,7 @@ product ACTIVEWIRE IOBOARD	0x0100	I/O Board
 product ACTIVEWIRE IOBOARD_FW1	0x0101	I/O Board, rev. 1 firmware
 
 /* Actiontec, Inc. products */
-product ACTIONTEC UAT1	0x7605	UAT1 Wireless Ethernet adapter
+product ACTIONTEC UAT1		0x7605	UAT1 Wireless Ethernet adapter
 
 /* ADMtek products */
 product ADMTEK PEGASUS		0x0986	AN986 USB Ethernet adapter
@@ -567,7 +584,7 @@ product APPLE SPEAKERS		0x1101	Speakers
 
 /* Asahi Optical products */
 product ASAHIOPTICAL OPTIO230	0x0004	Digital camera
-product ASAHIOPTICAL OPTIO330	0x0006  Digital camera
+product ASAHIOPTICAL OPTIO330	0x0006	Digital camera
 
 /* ASIX Electronics products */
 product ASIX AX88172		0x1720  USB 2.0 10/100 ethernet controller
@@ -606,19 +623,19 @@ product BILLIONTON USBLP100	0x0987	USB100LP
 product BILLIONTON USBEL100	0x0988	USB100EL
 product BILLIONTON USBE100	0x8511	USBE100
 
+/* Broadcom products */
+product BROADCOM BCM2033	0x2033	BCM2033 Bluetooth USB dongle
+
 /* Brother Industries products */
 product BROTHER HL1050		0x0002	HL-1050 laser printer
 
 /* Behavior Technology Computer products */
 product BTC BTC7932		0x6782	Keyboard with mouse port
 
-/* Broadcom products */
-product BROADCOM BCM2033	0x2033	BCM2033 Bluetooth USB dongle
-
 /* Canon, Inc. products */
 product CANON N656U		0x2206	CanoScan N656U
-product	CANON N1220U		0x2207	CanoScan N1220U
-product	CANON N676U		0x220d	CanoScan N676U
+product CANON N1220U		0x2207	CanoScan N1220U
+product CANON N676U		0x220d	CanoScan N676U
 product CANON N1240U		0x220e	CanoScan N1240U
 product CANON S10		0x3041	PowerShot S10
 product CANON S100		0x3045	PowerShot S100
@@ -631,12 +648,12 @@ product CATC CHIEF		0x000d	USB Chief Bus & Protocol Analyzer
 product CATC ANDROMEDA		0x1237	Andromeda hub
 
 /* CASIO products */
-product	CASIO NAMELAND		0x4001	CASIO Nameland EZ-USB
+product CASIO NAMELAND		0x4001	CASIO Nameland EZ-USB
 
 /* Cherry products */
 product CHERRY MY3000KBD	0x0001	My3000 keyboard
 product CHERRY MY3000HUB	0x0003	My3000 hub
-product	CHERRY CYBOARD		0x0004	CyBoard Keyboard
+product CHERRY CYBOARD		0x0004	CyBoard Keyboard
 
 /* Chic Technology products */
 product CHIC MOUSE1		0x0001	mouse
@@ -669,7 +686,7 @@ product FTDI SEMC_DSS20		0xfc82	SEMC DSS-20 SyncStation
 
 /* Cambridge Silicon Radio Ltd. products */
 product CSR BT_DONGLE		0x0001	Bluetooth USB dongle
-product	CSR CSRDFU		0xffff	USB Bluetooth Device in DFU State
+product CSR CSRDFU		0xffff	USB Bluetooth Device in DFU State
 
 /* CTX products */
 product CTX EX1300		0x9999	Ex1300 hub
@@ -703,7 +720,7 @@ product DIGI ACCELEPORT8	0x0008	AccelePort USB 8
 
 /* D-Link products */
 /*product DLINK DSBS25		0x0100	DSB-S25 serial adapter*/
-product	DLINK DUBE100		0x1a00	10/100 ethernet adapter
+product DLINK DUBE100		0x1a00	10/100 ethernet adapter
 product DLINK DSB650TX4		0x200c	10/100 ethernet adapter
 product DLINK DSB650C		0x4000	10Mbps ethernet adapter
 product DLINK DSB650TX1		0x4001	10/100 ethernet adapter
@@ -732,7 +749,7 @@ product ELSA MODEM1		0x2265	ELSA Modem Board
 product ELSA USB2ETHERNET	0x3000	Microlink USB2Ethernet
 
 /* EMS products */
-product EMS DUAL_SHOOTER        0x0003  PSX gun controller converter
+product EMS DUAL_SHOOTER	0x0003	PSX gun controller converter
 
 /* Entrega products */
 product ENTREGA 1S		0x0001	1S serial connector
@@ -744,7 +761,7 @@ product ENTREGA CENTRONICS	0x0006	Centronics connector
 product ENTREGA 1S9		0x0093	1S9 serial connector
 product ENTREGA EZUSB		0x8000	EZ-USB
 /*product ENTREGA SERIAL	0x8001	DB25 Serial connector*/
-product ENTREGA 2U4S		0x8004  2U4S serial connector/usb hub
+product ENTREGA 2U4S		0x8004	2U4S serial connector/usb hub
 /*product ENTREGA SERIAL_DB9	0x8093	DB9 Serial connector*/
 
 /* Epson products */
@@ -763,7 +780,7 @@ product EPSON 1250		0x010f	Perfection 1250U / 1250Photo scanner
 product EPSON 1650		0x0110	Perfection 1650 scanner
 product EPSON GT9700F		0x0112	GT-9700F scanner
 product EPSON GT9300UF		0x011b	GT-9300UF scanner
-product EPSON 3200		0x011c  Perfection 3200 scanner
+product EPSON 3200		0x011c	Perfection 3200 scanner
 product EPSON 1260		0x011d	Perfection 1260 scanner
 product EPSON 1660		0x011e	Perfection 1660 scanner
 product EPSON 1670		0x011f	Perfection 1670 scanner
@@ -775,7 +792,7 @@ product ETEK 1COM		0x8007	Serial port
 product EXTENDED XTNDACCESS	0x0100	XTNDAccess IrDA
 
 /* GoHubs products */
-product GOHUBS 	GOCOM232	0x1001	GoCOM232 Serial converter
+product GOHUBS GOCOM232		0x1001	GoCOM232 Serial converter
 
 /* Gravis products */
 product GRAVIS GAMEPADPRO	0x4001	GamePad Pro
@@ -797,39 +814,35 @@ product FTDI SERIAL_8U232AM	0x6001	8U232AM Serial converter
 product FUJIPHOTO MASS0100	0x0100	Mass Storage
 
 /* Fujitsu protducts */
-product	FUJITSU	AH_F401U	0x105b	AH-F401U Air H device
-
-/* Qualcomm products */
-product	QUALCOMM CDMA_MSM	0x3196	CDMA Technologies MSM modem
-product QUALCOMM2 CDMA_MSM	0x6000	CDMA Technologies MSM phone
+product FUJITSU AH_F401U	0x105b	AH-F401U Air H device
 
 /* General Instruments (Motorola) products */
 product GENERALINSTMNTS SB5100	0x5100	SURFboard SB5100 Cable modem
 
 /* Genesys Logic products */
-product	GENESYS GL650		0x0604	GL650 Hub
-product	GENESYS GL641USB	0x0700	GL641USB CompactFlash Card Reader
-product	GENESYS GL641USB2IDE_2	0x0701	GL641USB USB-IDE Bridge No 2
-product	GENESYS GL641USB2IDE	0x0702	GL641USB USB-IDE Bridge
+product GENESYS GL650		0x0604	GL650 Hub
+product GENESYS GL641USB	0x0700	GL641USB CompactFlash Card Reader
+product GENESYS GL641USB2IDE_2	0x0701	GL641USB USB-IDE Bridge No 2
+product GENESYS GL641USB2IDE	0x0702	GL641USB USB-IDE Bridge
 
 /* HAL Corporation products */
 product HAL IMR001		0x0011	Crossam2+USB IR commander
 
 /* Hagiwara products */
-product HAGIWARA FGSM		0x0002  FlashGate SmartMedia Card Reader
-product HAGIWARA FGCF		0x0003  FlashGate CompactFlash Card Reader
-product HAGIWARA FG		0x0005  FlashGate
+product HAGIWARA FGSM		0x0002	FlashGate SmartMedia Card Reader
+product HAGIWARA FGCF		0x0003	FlashGate CompactFlash Card Reader
+product HAGIWARA FG		0x0005	FlashGate
 
 /* Handspring, Inc. */
 product HANDSPRING VISOR	0x0100	Handspring Visor
 product HANDSPRING TREO		0x0200	Handspring Treo
-product	HANDSPRING TREO600	0x0300	Handspring Treo 600
+product HANDSPRING TREO600	0x0300	Handspring Treo 600
 
 /* Hauppauge Computer Works */
 product HAUPPAUGE WINTV_USB_FM	0x4d12	WinTV USB FM
 
 /* Hawking Technologies products */
-product	HAWKING UF100		0x400c	10/100 USB Ethernet
+product HAWKING UF100		0x400c	10/100 USB Ethernet
 
 /* Hitachi, Ltd. products */
 product HITACHI DVDCAM_USB	0x001e	DVDCAM USB HS Interface
@@ -842,11 +855,15 @@ product HP 880C			0x0104	DeskJet 880C
 product HP 4200C		0x0105	ScanJet 4200C
 product HP CDWRITERPLUS		0x0107	CD-Writer Plus
 product HP KBDHUB		0x010c	Multimedia Keyboard Hub
+product HP G55XI		0x0111	OfficeJet G55xi
+product HP HN210W		0x011c	HN210W 802.11b WLAN
+product HP 49GPLUS		0x0121	49g+ graphing calculator
 product HP 6200C		0x0201	ScanJet 6200C
 product HP S20b			0x0202	PhotoSmart S20
 product HP 815C			0x0204	DeskJet 815C
 product HP 3300C		0x0205	ScanJet 3300C
 product HP CDW8200		0x0207	CD-Writer Plus 8200e
+product HP MMKEYB		0x020c	Multimedia keyboard
 product HP 1220C		0x0212	DeskJet 1220C
 product HP 810C			0x0304	DeskJet 810C/812C
 product HP 4300C		0x0305	Scanjet 4300C
@@ -898,19 +915,19 @@ product INTREPIDCS VALUECAN	0x0601	ValueCAN CAN bus interface
 product INTREPIDCS NEOVI	0x0701	NeoVI Blue vehicle bus interface
 
 /* I/O DATA products */
+product IODATA IU_CD2		0x0204	DVD Multi-plus unit iU-CD2
+product IODATA DVR_UEH8		0x0206	DVD Multi-plus unit DVR-UEH8
 product IODATA USBETT		0x0901	USB ETT
 product IODATA USBETTX		0x0904	USB ETTX
 product IODATA USBETTXS		0x0913	USB ETTX
-product	IODATA USBRSAQ		0x0a03	USB serial adapter USB-RSAQ1
-product	IODATA IU_CD2		0x0204	DVD Multi-plus unit iU-CD2
-product	IODATA DVR_UEH8		0x0206	DVD Multi-plus unit DVR-UEH8
+product IODATA USBRSAQ		0x0a03	USB serial adapter USB-RSAQ1
 
 /* Iomega products */
 product IOMEGA ZIP100		0x0001	Zip 100
 product IOMEGA ZIP250		0x0030	Zip 250
 
 /* JVC products */
-product	JVC GR_DX95		0x000a	GR-DX95
+product JVC GR_DX95		0x000a	GR-DX95
 
 /* JRC products */
 product JRC AH_J3001V_J3002V	0x0001	AirH\" PHONE AH-J3001V/J3002V
@@ -983,7 +1000,7 @@ product LINKSYS USB100H1	0x2204	USB100H1 Ethernet/HPNA
 product LINKSYS USB10TA		0x2206	USB10TA Ethernet
 product LINKSYS USB10TX2	0x400b	USB10TX
 product LINKSYS2 WUSB11		0x2219	WUSB11 Wireless adapter
-product LINKSYS2 USB200M	0x2226  USB 2.0 10/100 ethernet controller
+product LINKSYS2 USB200M	0x2226	USB 2.0 10/100 ethernet controller
 product LINKSYS3 WUSB11v28	0x2233	WUSB11 v2.8 wireless adapter
 
 /* Logitech products */
@@ -1010,8 +1027,8 @@ product LOGITECH MX700		0xc506	Cordless optical mouse
 product LOGITECH QUICKCAMPRO2	0xd001	QuickCam Pro
 
 /* Logitec Corp. products */
-product	LOGITEC LDR_H443SU2	0x0033	DVD Multi-plus unit LDR-H443SU2
-product	LOGITEC LDR_H443U2	0x00b3	DVD Multi-plus unit LDR-H443U2
+product LOGITEC LDR_H443SU2	0x0033	DVD Multi-plus unit LDR-H443SU2
+product LOGITEC LDR_H443U2	0x00b3	DVD Multi-plus unit LDR-H443U2
 
 /* Lucent products */
 product LUCENT EVALKIT		0x1001	USS-720 evaluation kit
@@ -1040,12 +1057,15 @@ product MELCO LUATX1		0x0001	LUA-TX Ethernet
 product MELCO LUATX5		0x0005	LUA-TX Ethernet
 product MELCO LUA2TX5		0x0009	LUA2-TX Ethernet
 product MELCO LUAKTX		0x0012	LUA-KTX Ethernet
-product	MELCO DUBPXXG		0x001c	USB-IDE Bridge: DUB-PxxG
-product	MELCO LUAU2KTX		0x003d	LUA-U2-KTX Ethernet
+product MELCO DUBPXXG		0x001c	USB-IDE Bridge: DUB-PxxG
+product MELCO LUAU2KTX		0x003d	LUA-U2-KTX Ethernet
 
 /* Metricom products */
 product METRICOM RICOCHET_GS	0x0001	Ricochet GS
 
+/* Micro Star International products */
+product MSI BT_DONGLE		0x1967	Bluetooth USB dongle
+
 /* Microsoft products */
 product MICROSOFT SIDEPREC	0x0008	SideWinder Precision Pro
 product MICROSOFT INTELLIMOUSE	0x0009	IntelliMouse
@@ -1072,6 +1092,9 @@ product MICROTEK V6USL		0x00a3	ScanMaker V6USL
 product MICROTEK V6USL2		0x80a3	ScanMaker V6USL
 product MICROTEK V6UL		0x80ac	ScanMaker V6UL
 
+/* Microtune, Inc. products */
+product MICROTUNE BT_DONGLE	0x1000	Bluetooth USB dongle
+
 /* Midiman products */
 product MIDIMAN MIDISPORT2X2	0x1001	Midisport 2x2
 
@@ -1081,12 +1104,6 @@ product MINOLTA S304		0x4007	Dimage S304
 product MINOLTA X		0x4009	Dimage X
 product MINOLTA 5400		0x400e	Dimage 5400
 
-/* Micro Star International products */
-product MSI BT_DONGLE		0x1967	Bluetooth USB dongle
-
-/* Microtune, Inc. products */
-product MICROTUNE BT_DONGLE	0x1000	Bluetooth USB dongle
-
 /* Mitsumi products */
 product MITSUMI CDRRW		0x0000	CD-R/RW Drive
 product MITSUMI BT_DONGLE	0x641f	Bluetooth USB dongle
@@ -1112,7 +1129,7 @@ product MUSTEK MDC800		0xa800	MDC-800 digital camera
 
 /* M-Systems products */
 product MSYSTEMS DISKONKEY	0x0010	DiskOnKey
-product	MSYSTEMS DISKONKEY2	0x0011	DiskOnKey
+product MSYSTEMS DISKONKEY2	0x0011	DiskOnKey
 
 /* National Semiconductor */
 product NATIONAL BEARPAW1200	0x1000	BearPaw 1200
@@ -1162,9 +1179,9 @@ product PALM ZIRE31		0x0061	Palm Zire 31
 product PALM ZIRE		0x0070	Palm Zire
 
 /* Panasonic products */
-product	PANASONIC KXLRW32AN	0x0d09	CD-R Drive KXL-RW32AN
-product	PANASONIC KXLCB20AN	0x0d0a	CD-R Drive KXL-CB20AN
-product	PANASONIC KXLCB35AN	0x0d0e	DVD-ROM & CD-R/RW
+product PANASONIC KXLRW32AN	0x0d09	CD-R Drive KXL-RW32AN
+product PANASONIC KXLCB20AN	0x0d0a	CD-R Drive KXL-CB20AN
+product PANASONIC KXLCB35AN	0x0d0e	DVD-ROM & CD-R/RW
 product PANASONIC SDCAAE	0x1b00	MultiMediaCard Adapter
 
 /* Peracom products */
@@ -1190,7 +1207,7 @@ product PHILIPSSEMI HUB1122	0x1122	hub
 product PIENGINEERING PS2USB	0x020b	PS2 to Mac USB Adapter
 
 /* Plextor Corp. */
-product	PLEXTOR 40_12_40U	0x0011	PlexWriter 40/12/40U
+product PLEXTOR 40_12_40U	0x0011	PlexWriter 40/12/40U
 
 /* PLX products */
 product PLX TESTBOARD		0x9060	test board
@@ -1220,13 +1237,17 @@ product PRIMAX PCGAUMS1		0x4d04	Sony PCGA-UMS1
 product PROLIFIC PL2301		0x0000	PL2301 Host-Host interface
 product PROLIFIC PL2302		0x0001	PL2302 Host-Host interface
 product PROLIFIC RSAQ2		0x04bb	PL2303 Serial adapter (IODATA USB-RSAQ2)
-product PROLIFIC PL2303 	0x2303  PL2303 Serial adapter (ATEN/IOGEAR UC232A)
+product PROLIFIC PL2303		0x2303	PL2303 Serial adapter (ATEN/IOGEAR UC232A)
 product PROLIFIC PL2305		0x2305	Parallel printer adapter
 product PROLIFIC ATAPI4		0x2307	ATAPI-4 Bridge Controller
 
 /* Putercom products */
 product PUTERCOM UPA100		0x047e	USB-1284 BRIDGE
 
+/* Qualcomm products */
+product QUALCOMM CDMA_MSM	0x3196	CDMA Technologies MSM modem
+product QUALCOMM2 CDMA_MSM	0x6000	CDMA Technologies MSM phone
+
 /* Qtronix products */
 product QTRONIX 980N		0x2011	Scorpion-980N keyboard
 
@@ -1234,15 +1255,15 @@ product QTRONIX 980N		0x2011	Scorpion-980N keyboard
 product QUICKSHOT STRIKEPAD	0x6238	USB StrikePad
 
 /* Rainbow Technologies products */
-product	RAINBOW IKEY2000	0x1200	i-Key 2000
+product RAINBOW IKEY2000	0x1200	i-Key 2000
 
 /* ReakTek products */
 product REALTEK USBKR100	0x8150	USBKR100 USB Ethernet (GREEN HOUSE)
 
 /* Roland products */
-product	ROLAND UM1		0x0009	UM-1 MIDI I/F
-product	ROLAND UM880N		0x0014	EDIROL UM-880 MIDI I/F (native)
-product	ROLAND UM880G		0x0015	EDIROL UM-880 MIDI I/F (generic)
+product ROLAND UM1		0x0009	UM-1 MIDI I/F
+product ROLAND UM880N		0x0014	EDIROL UM-880 MIDI I/F (native)
+product ROLAND UM880G		0x0015	EDIROL UM-880 MIDI I/F (generic)
 
 /* Rockfire products */
 product ROCKFIRE GAMEPAD	0x2033	gamepad 203USB
@@ -1315,7 +1336,7 @@ product SMC2 2020HUB		0x2020	USB Hub
 product SMC3 2662WUSB		0xa002	2662W-AR Wireless Adapter
 
 /* SOHOware products */
-product	SOHOWARE NUB100		0x9100	10/100 USB Ethernet
+product SOHOWARE NUB100		0x9100	10/100 USB Ethernet
 
 /* SOLID YEAR products */
 product SOLIDYEAR KEYBOARD	0x2101	Solid Year USB keyboard
@@ -1334,7 +1355,7 @@ product SONY CLIE_41		0x009a	Sony Clie v4.1
 product SONY CLIE_NX60		0x00da	Sony Clie nx60
 
 /* Sony Ericsson products */
-product	SONYERICSSON DCU10	0x0528	USB Cable
+product SONYERICSSON DCU10	0x0528	USB Cable
 
 /* SOURCENEXT products */
 product SOURCENEXT KEIKAI8	0x039f	KeikaiDenwa 8
@@ -1347,11 +1368,11 @@ product STMICRO COMMUNICATOR	0x7554	USB Communicator
 product STSN STSN0001		0x0001	Internet Access Device
 
 /* SUN Corporation products */
-product	SUNTAC DS96L		0x0003	SUNTAC U-Cable type D2
+product SUNTAC DS96L		0x0003	SUNTAC U-Cable type D2
 product SUNTAC PS64P1		0x0005	SUNTAC U-Cable type P1
 product SUNTAC VS10U		0x0009	SUNTAC Slipper U
-product	SUNTAC IS96U		0x000a	SUNTAC Ir-Trinity
-product	SUNTAC AS64LX		0x000b	SUNTAC U-Cable type A3
+product SUNTAC IS96U		0x000a	SUNTAC Ir-Trinity
+product SUNTAC AS64LX		0x000b	SUNTAC U-Cable type A3
 product SUNTAC AS144L4		0x0011	SUNTAC U-Cable type A4
 
 /* Sun Microsystems products */
@@ -1359,15 +1380,15 @@ product SUN2 KEYBOARD		0x0005	Type 6 USB keyboard
 /* XXX The above is a North American PC style keyboard possibly */
 product SUN2 MOUSE		0x0100	Type 6 USB mouse
 
-/* System TALKS, Inc. */
-product	SYSTEMTALKS SGCX2UL	0x1920	SGC-X2UL
-
 /* Supra products */
 product DIAMOND2 SUPRAEXPRESS56K 0x07da	Supra Express 56K modem
 product DIAMOND2 SUPRA2890	0x0b4a	SupraMax 2890 56K Modem
 product DIAMOND2 RIO600USB	0x5001	Rio 600 USB
 product DIAMOND2 RIO800USB	0x5002	Rio 800 USB
 
+/* System TALKS, Inc. */
+product SYSTEMTALKS SGCX2UL	0x1920	SGC-X2UL
+
 /* Taugagreining products */
 product TAUGA CAMERAMATE	0x0005	CameraMate (DPCM_USB)
 
@@ -1392,7 +1413,7 @@ product TI TUSB2046		0x2046	TUSB2046 hub
 product THRUST FUSION_PAD	0xa0a3	Fusion Digital Gamepad
 
 /* Toshiba Corporation products */
-product	TOSHIBA	POCKETPC_E740	0x0706	PocketPC e740
+product TOSHIBA POCKETPC_E740	0x0706	PocketPC e740
 
 /* Trek Technology products */
 product TREK THUMBDRIVE		0x1111	ThumbDrive
@@ -1439,6 +1460,7 @@ product VODAFONE MC3G		0x5000	Mobile Connect 3G datacard
 /* Wacom products */
 product WACOM CT0405U		0x0000	CT-0405-U Tablet
 product WACOM GRAPHIRE		0x0010	Graphire
+product WACOM GRAPHIRE3		0x0013	Graphire 3
 product WACOM INTUOSA5		0x0021	Intuos A5
 product WACOM GD0912U		0x0022	Intuos 9x12 Graphics Tablet
 
@@ -1454,11 +1476,11 @@ product YEDATA FLASHBUSTERU	0x0000	Flashbuster-U
 
 /* Yamaha products */
 product YAMAHA UX256		0x1000	UX256 MIDI I/F
-product	YAMAHA UX96		0x1008	UX96 MIDI I/F
-product	YAMAHA RTA54I		0x4000	NetVolante RTA54i Broadband&ISDN Router
-product	YAMAHA RTA55I		0x4004	NetVolante RTA55i Broadband VoIP Router
-product	YAMAHA RTW65B		0x4001	NetVolante RTW65b Broadband Wireless Router
-product	YAMAHA RTW65I		0x4002	NetVolante RTW65i Broadband&ISDN Wireless Router
+product YAMAHA UX96		0x1008	UX96 MIDI I/F
+product YAMAHA RTA54I		0x4000	NetVolante RTA54i Broadband&ISDN Router
+product YAMAHA RTA55I		0x4004	NetVolante RTA55i Broadband VoIP Router
+product YAMAHA RTW65B		0x4001	NetVolante RTW65b Broadband Wireless Router
+product YAMAHA RTW65I		0x4002	NetVolante RTW65i Broadband&ISDN Wireless Router
 
 /* Yano products */
 product YANO U640MO		0x0101	U640MO-03