- sync with kernel-2.6.10-mm1

- remove bogus usbcore entries
- solve a few conflicts regarding devices claimed by modules
- clean DVB entries

2 files changed, 30 insertions, 22 deletions

diff --git a/lst/pcitable b/lst/pcitable
index 4bd70c79..74d5fbb7 100644
--- a/lst/pcitable
+++ b/lst/pcitable
@@ -2477,7 +2477,7 @@
 0x10de	0x00e1	"amd64-agp"	"nVidia Corporation|nForce3 250Gb Host Bridge"
 0x10de	0x00e2	"unknown"	"nVidia Corporation|nForce3 250Gb AGP Host to PCI Bridge"
 0x10de	0x00e3	"sata_nv"	"nVidia Corporation|CK8S Serial ATA Controller (v2.5)"
-0x10de	0x00e4	"unknown"	"nVidia Corporation|nForce 250Gb PCI System Management"
+0x10de	0x00e4	"i2c-nforce2"	"nVidia Corporation|nForce 250Gb PCI System Management"
 0x10de	0x00e5	"amd74xx"	"nVidia Corporation|CK8S Parallel ATA Controller (v2.5)"
 0x10de	0x00e6	"forcedeth"	"nVidia Corp.|Ethernet adapter"
 0x10de	0x00e7	"unknown"	"nVidia Corporation|CK8S USB Controller"
@@ -3181,15 +3181,9 @@
 0x1131	0x7134	"saa7134"	"Philips Semiconductors|SAA7134"
 0x1131	0x7135	"saa7134"	"Philips Semiconductors|SAA7135 Audio+video broadcast decoder"
 0x1131	0x7145	"unknown"	"Philips Semiconductors|SAA7145"
-0x1131	0x7146	0x00a1	0x00a1	"dvb-ttpci"	"Philips Semiconductors|SAA7146"
-0x1131	0x7146	0x00a1	0xa1a0	"dvb-ttpci"	"Philips Semiconductors|SAA7146"
 0x1131	0x7146	0x110a	0x0000	"dvb-ttpci"	"Philips Semiconductors|Fujitsu/Siemens DVB-C card rev1.5"
-0x1131	0x7146	0x110a	0xffff	"dvb-ttpci"	"Philips Semiconductors|Fujitsu/Siemens DVB-C card rev1.5"
 0x1131	0x7146	0x1131	0x4f56	"budget-av"	"Philips Semiconductors|KNC1 DVB-S Budget"
 0x1131	0x7146	0x1131	0x4f61	"budget"	"Philips Semiconductors|Fujitsu-Siemens Activy DVB-S Budget"
-0x1131	0x7146	0x114b	0x2003	"dvb-ttpci"	"Philips Semiconductors|DVRaptor Video Edit/Capture Card"
-0x1131	0x7146	0x11bd	0x0006	"dvb-ttpci"	"Philips Semiconductors|DV500 Overlay"
-0x1131	0x7146	0x11bd	0x000a	"dvb-ttpci"	"Philips Semiconductors|DV500 Overlay"
 0x1131	0x7146	0x13c2	0x0000	"dvb-ttpci"	"Philips Semiconductors|Siemens/Technotrend/Hauppauge DVB card rev1.3 or rev1.5"
 0x1131	0x7146	0x13c2	0x0001	"dvb-ttpci"	"Philips Semiconductors|Technotrend/Hauppauge DVB card rev1.3 or rev1.6"
 0x1131	0x7146	0x13c2	0x0002	"dvb-ttpci"	"Philips Semiconductors|Technotrend/Hauppauge DVB card rev2.1"
@@ -3216,8 +3210,7 @@
 0x1131	0x7146	0x17c8	0x2402	"hexium_gemini"	"Philips Semiconductors|SAA7146"
 0x1131	0x7146	0x1894	0x0020	"budget-av"	"Philips Semiconductors|SAA7146"
 0x1131	0x7146	0x1894	0x0030	"budget-av"	"Philips Semiconductors|SAA7146"
-0x1131	0x7146	0xffc2	0x0000	"dvb-ttpci"	"Philips Semiconductors|SAA7146"
-0x1131	0x7146	"dvb-ttpci"	"Philips Semiconductors|SAA7146"
+0x1131	0x7146	"dpc7146"	"Philips Semiconductors|SAA7146"
 0x1131	0x9730	"unknown"	"Philips Semiconductors|SAA9730 Ethernet controller"
 0x1133	0x7711	"unknown"	"Eicon Technology Corp.|EiconCard C91"
 0x1133	0x7901	"unknown"	"Eicon|EiconCard S90"
@@ -3409,7 +3402,7 @@
 0x1166	0x0101	"unknown"	"Reliance Computer Corp./ServerWorks|CIOB-X2"
 0x1166	0x0110	"unknown"	"ServerWorks|CIOB-E I/O Bridge with Gigabit Ethernet"
 0x1166	0x0200	"i2c-piix4"	"ServerWorks|OSB4"
-0x1166	0x0201	"scb2_flash"	"ServerWorks|CSB5"
+0x1166	0x0201	"i2c-piix4"	"ServerWorks|CSB5"
 0x1166	0x0203	"i2c-piix4"	"ServerWorks|CSB6 South Bridge"
 0x1166	0x0211	"serverworks"	"ServerWorks|OSB4 IDE Controller"
 0x1166	0x0212	"serverworks"	"Reliance Computer|CSB5 IDE interface"
@@ -4874,14 +4867,14 @@
 0x15b0	0x2bd0	"ISDN:hisax,type=35"	"Zoltrix|2BD0 ISDN Adapter"
 0x15b3	0x15b3	"unknown"	"Mellanox Technology|Mellanox Technologies"
 0x15b3	0x5274	"unknown"	"Mellanox Technology|MT21108 InfiniBridge"
-0x15b3	0x5a44	"unknown"	"Mellanox Technology|MT23108 InfiniHost"
+0x15b3	0x5a44	"ib_mthca"	"Mellanox Technology|MT23108 InfiniHost"
 0x15b3	0x5a45	"unknown"	"Mellanox Technology|MT23108 InfiniHost (Tavor)"
 0x15b3	0x5a46	"unknown"	"Mellanox Technology|MT23108 PCI Bridge"
 0x15b3	0x5e8c	"unknown"	"Mellanox Technology|MT24204 [InfiniHost III Lx HCA]"
 0x15b3	0x5e8d	"unknown"	"Mellanox Technology|MT24204 [InfiniHost III Lx HCA Flash Recovery]"
-0x15b3	0x6278	"unknown"	"Mellanox Technology|MT25208 InfiniHost III Ex (Tavor compatibility mode)"
+0x15b3	0x6278	"ib_mthca"	"Mellanox Technology|MT25208 InfiniHost III Ex (Tavor compatibility mode)"
 0x15b3	0x6279	"unknown"	"Mellanox Technology|MT25208 [InfiniHost III Ex HCA Flash Recovery]"
-0x15b3	0x6282	"unknown"	"Mellanox Technology|MT25208 InfiniHost III Ex"
+0x15b3	0x6282	"ib_mthca"	"Mellanox Technology|MT25208 InfiniHost III Ex"
 0x15bc	0x0101	"unknown"	"Agilent Technologies|n2530a DX2+ FC-AL Adapter"
 0x15bc	0x2530	"unknown"	"Agilent Technologies|??? HP Communications Port"
 0x15bc	0x2531	"unknown"	"Agilent Technologies|??? HP Toptools Remote Control Adapter"
@@ -5019,11 +5012,11 @@
 0x1850	0x1851	"bttv"	"Flyvideo 98 (LR50) / Chronos Video Shuttle II"
 0x1851	0x1851	"bttv"	"Flyvideo 98EZ (LR51) / CyberMail AV"
 0x1852	0x1852	"bttv"	"Flyvideo 98FM (LR50) / Typhoon TView TV/FM Tuner"
-0x1867	0x5a44	"unknown"	"Topspin Communications|MT23108 PCI-X HCA"
+0x1867	0x5a44	"ib_mthca"	"Topspin Communications|MT23108 PCI-X HCA"
 0x1867	0x5a45	"unknown"	"Topspin Communications|MT23108 PCI-X HCA flash recovery"
 0x1867	0x5a46	"unknown"	"Topspin Communications|MT23108 PCI-X HCA bridge"
-0x1867	0x6278	"unknown"	"Topspin Communications|MT25208 InfiniHost III Ex (Tavor compatibility mode)"
-0x1867	0x6282	"unknown"	"Topspin Communications|MT25208 InfiniHost III Ex"
+0x1867	0x6278	"ib_mthca"	"Topspin Communications|MT25208 InfiniHost III Ex (Tavor compatibility mode)"
+0x1867	0x6282	"ib_mthca"	"Topspin Communications|MT25208 InfiniHost III Ex"
 0x1888	0x0301	"unknown"	"Varisys Ltd|VMFX1 FPGA PMC module"
 0x1888	0x0601	"unknown"	"Varisys Ltd|VSM2 dual PMC carrier"
 0x1888	0x0710	"unknown"	"Varisys Ltd|VS14x series PowerPC PCI board"
diff --git a/lst/usbtable b/lst/usbtable
index cc1cb5b5..fc98e777 100644
--- a/lst/usbtable
+++ b/lst/usbtable
@@ -1,6 +1,7 @@
 0x0000	0x0000	"unknown"	"Virtual|Hub"
 0x0001	0x10d2	"usblcd"	""
 0x0003	0x0104	0x00be	0x0000	"ipaq"	""
+0x0003	0x010c	0x145f	0x0000	"dvb-dibusb"	""
 0x0003	0x03e8	0x0004	0x0000	"se401"	""
 0x0003	0x03e8	0x0008	0x0000	"kaweth"	""
 0x0003	0x03eb	0x4102	0x0000	"at76c503-rfmd"	""
@@ -159,7 +160,7 @@
 0x0003	0x04a5	0x9001	0x0000	"at76c503-rfmd"	""
 0x0003	0x04b4	0x0002	0x0000	"cytherm"	""
 0x0003	0x04b4	0x1002	0x0000	"dsbr100"	""
-0x0003	0x04b4	0x8613	0x0000	"usbtest"	""
+0x0003	0x04b4	0x8613	0x0000	"dvb-dibusb"	""
 0x0003	0x04bb	0x0901	0x0000	"kaweth"	""
 0x0003	0x04bb	0x0904	0x0000	"pegasus"	""
 0x0003	0x04bb	0x0913	0x0000	"pegasus"	""
@@ -192,9 +193,9 @@
 0x0003	0x0525	0xa4a3	0x0000	"usbtest"	""
 0x0003	0x0525	0xa4a4	0x0000	"usbtest"	""
 0x0003	0x0547	0x0080	0x0000	"usbtest"	""
-0x0003	0x0547	0x1002	0x0000	"usbtest"	""
+0x0003	0x0547	0x1002	0x0000	"dvb-dibusb"	""
 0x0003	0x0547	0x2008	0x0000	"pl2303"	""
-0x0003	0x0547	0x2235	0x0000	"usbtest"	""
+0x0003	0x0547	0x2235	0x0000	"dvb-dibusb"	""
 0x0003	0x0547	0x2720	0x0000	"usbnet"	""
 0x0003	0x0547	0x2727	0x0000	"usbnet"	""
 0x0003	0x0547	0x9999	0x0000	"dabusb"	""
@@ -262,6 +263,7 @@
 0x0003	0x05a9	"ov511"	""
 0x0003	0x05c5	"digi_acceleport"	""
 0x0003	0x05cc	0x3000	0x0000	"pegasus"	""
+0x0003	0x05d8	"dvb-dibusb"	""
 0x0003	0x05da	"microtek"	""
 0x0003	0x05dd	0xff31	0x0000	"at76c503-i3861"	""
 0x0003	0x05e3	0x0502	0x0000	"usbnet"	""
@@ -433,6 +435,11 @@
 0x0003	0x0b3b	0x1601	0x0000	"prism2_usb"	""
 0x0003	0x0b3b	0x1602	0x0000	"prism2_usb"	""
 0x0003	0x0b3b	0x1612	0x0000	"at76c503-i3861"	""
+0x0003	0x0b48	0x1003	0x0000	"dvb-ttusb-budget"	""
+0x0003	0x0b48	0x1005	0x0000	"dvb-ttusb-budget"	""
+0x0003	0x0b48	0x1006	0x0000	"ttusb_dec"	""
+0x0003	0x0b48	0x1008	0x0000	"ttusb_dec"	""
+0x0003	0x0b48	0x1009	0x0000	"ttusb_dec"	""
 0x0003	0x0b48	"dvb-ttusb-budget"	""
 0x0003	0x0b95	0x1720	0x0000	"usbnet"	""
 0x0003	0x0baf	0x00eb	0x0000	"prism2_usb"	""
@@ -454,6 +461,7 @@
 0x0003	0x0c52	"ftdi_sio"	""
 0x0003	0x0c88	0x0021	0x0000	"visor"	""
 0x0003	0x0c98	0x1140	0x0000	"pcwd_usb"	""
+0x0003	0x0ccd	0x0038	0x0000	"cinergyT2"	""
 0x0003	0x0cde	0x0001	0x0000	"at76c503-i3861"	""
 0x0003	0x0cde	0x0002	0x0000	"prism2_usb"	""
 0x0003	0x0d46	"kobil_sct"	""
@@ -473,9 +481,11 @@
 0x0003	0x0eef	0x0001	0x0000	"touchkitusb"	""
 0x0003	0x0f94	0x0001	0x0000	"ftdi_sio"	""
 0x0003	0x0fc5	0x1223	0x0000	"usbled"	""
+0x0003	0x1025	"dvb-dibusb"	""
 0x0003	0x1044	0x8002	0x0000	"pegasus"	""
 0x0003	0x1044	0x8003	0x0000	"at76c503-rfmd"	""
 0x0003	0x1046	0x9967	0x0000	"w9968cf"	""
+0x0003	0x10b8	"dvb-dibusb"	""
 0x0003	0x10bd	0x1427	0x0000	"kaweth"	""
 0x0003	0x1110	"eagle-usb"	""
 0x0003	0x11f7	0x02df	0x0000	"pl2303"	""
@@ -490,8 +500,10 @@
 0x0003	0x1371	0x0014	0x0000	"at76c505-rfmd2958"	""
 0x0003	0x1371	0x5743	0x0000	"at76c503-rfmd"	""
 0x0003	0x13d2	0x0400	0x0000	"kaweth"	""
+0x0003	0x13d3	"dvb-dibusb"	""
 0x0003	0x1453	0x4026	0x0000	"pl2303"	""
 0x0003	0x1485	0x0001	0x0000	"kaweth"	""
+0x0003	0x14aa	"dvb-dibusb"	""
 0x0003	0x15e8	"pegasus"	""
 0x0003	0x1604	"snd-usb-usx2y"	""
 0x0003	0x1608	0x0001	0x0000	"io_edgeport"	""
@@ -534,6 +546,8 @@
 0x0003	0x1668	0x6106	0x0000	"prism2_usb"	""
 0x0003	0x1668	0x7605	0x0000	"at76c503-rfmd"	""
 0x0003	0x1690	0x0601	0x0000	"ipaq"	""
+0x0003	0x1822	"dvb-dibusb"	""
+0x0003	0x185b	"dvb-dibusb"	""
 0x0003	0x1915	0x2233	0x0000	"at76c505-rfmd2958"	""
 0x0003	0x2001	0x1a00	0x0000	"usbnet"	""
 0x0003	0x2001	0x200c	0x0000	"pegasus"	""
@@ -557,6 +571,7 @@
 0x0003	0x413c	0x8100	0x0000	"prism2_usb"	""
 0x0003	0x4428	0x0012	0x0000	"irda-usb"	""
 0x0003	0x4766	0x0001	0x0000	"visor"	""
+0x0003	0x5032	"dvb-dibusb"	""
 0x0003	0x50c2	0x4013	0x0000	"prism2_usb"	""
 0x0003	0x5e04	0xce00	0x0000	"ipaq"	""
 0x0003	0x6189	0x182d	0x0000	"usbnet"	""
@@ -564,6 +579,7 @@
 0x0003	0x8086	0x0200	0x0000	"at76c503-i3861"	""
 0x0003	0x8086	0x07d3	0x0000	"usbnet"	""
 0x0003	0x8086	0x1111	0x0000	"prism2_usb"	""
+0x0003	0xeb1a	"dvb-dibusb"	""
 0x0003	0xfff0	0xfff0	0x0000	"usbtest"	""
 0x000f	0x03ee	0x6901	0x0000	"usb-storage"	""
 0x000f	0x03f0	"usb-storage"	""
@@ -614,9 +630,8 @@
 0x000f	0x1019	0x0c55	0x0000	"usb-storage"	""
 0x000f	0x1065	0x2136	0x0000	"usb-storage"	""
 0x000f	0x55aa	0xa103	0x0000	"usb-storage"	""
-0x0010	0x0000	"usbcore"	""
-0x0070	0x0000	"hci_usb"	""
-0x0080	0x0000	"usbcore"	""
+0x0070	0x0000	"usblp"	""
+0x0080	0x0000	"usbhid"	""
 0x0083	0x0499	"snd-usb-audio"	""
 0x0083	0x0582	"snd-usb-audio"	""
 0x0083	0x0763	"snd-usb-audio"	""