sync with kernel-2.6.12-rc5-mm1

2 files changed, 49 insertions, 2 deletions

diff --git a/lst/pcitable b/lst/pcitable
index 398622ed..0c914b16 100644
--- a/lst/pcitable
+++ b/lst/pcitable
@@ -195,8 +195,8 @@
 0x1000	0x0628	"mptscsih"	"Symbios|FC919X"
 0x1000	0x0629	"mptscsih"	"Symbios|FC919X_LAN"
 0x1000	0x0630	"unknown"	"LSI Logic|LSIFC920 Fibre Channel I/O Processor"
-0x1000	0x0640	"unknown"	"LSI Logic / Symbios Logic|FC949X Fibre Channel Adapter"
-0x1000	0x0642	"unknown"	"LSI Logic / Symbios Logic|FC939X Fibre Channel Adapter"
+0x1000	0x0640	"mptfc"	"LSI Logic / Symbios Logic|FC949X Fibre Channel Adapter"
+0x1000	0x0642	"mptfc"	"LSI Logic / Symbios Logic|FC939X Fibre Channel Adapter"
 0x1000	0x0701	"yellowfin"	"Symbios|83C885 gigabit ethernet"
 0x1000	0x0702	"yellowfin"	"Symbios|Yellowfin G-NIC gigabit ethernet"
 0x1000	0x0804	"unknown"	"LSI Logic / Symbios Logic|SA2010"
@@ -6167,6 +6167,7 @@
 0x8086	0x1960	0xe4bf	0x3100	"megaraid"	"Intel Corp.|CX1-BAND"
 0x8086	0x1960	0xe4bf	0xffff	"8250_pci"	""
 0x8086	0x1960	"megaraid"	"Intel Corp.|80960RP [i960RP Microprocessor]"
+0x8086	0x1962	0x105a	0xffff	"i2o_core"	""
 0x8086	0x1962	"unknown"	"Intel Corp.|80960RM [i960RM Microprocessor]"
 0x8086	0x1a10	"unknown"	"Intel Corp.|Celeron(tm) Processor to I/O Controller"
 0x8086	0x1a11	"unknown"	"Intel Corp.|Celeron(tm) Processor to I/O Controller"
diff --git a/lst/usbtable b/lst/usbtable
index 98712496..32b4c5d4 100644
--- a/lst/usbtable
+++ b/lst/usbtable
@@ -33,6 +33,7 @@
 0x0003	0x03f0	0x811c	0x0000	"pegasus"	""
 0x0003	0x03f3	0x0020	0x0000	"prism2_usb"	""
 0x0003	0x0402	0x5632	0x0000	"usbnet"	""
+0x0003	0x0403	0xf9e9	0x0000	"itmtouch"	""
 0x0003	0x0403	"ftdi_sio"	""
 0x0003	0x0409	"ipaq"	""
 0x0003	0x0411	0x0001	0x0000	"pegasus"	""
@@ -362,6 +363,7 @@
 0x0003	0x0536	0x01a0	0x0000	"ipaq"	""
 0x0003	0x0543	"ipaq"	""
 0x0003	0x0547	0x0080	0x0000	"usbtest"	""
+0x0003	0x0547	0x0201	0x0000	"dvb-usb-digitv"	""
 0x0003	0x0547	0x1002	0x0000	"dvb-dibusb"	""
 0x0003	0x0547	0x2008	0x0000	"pl2303"	""
 0x0003	0x0547	0x2235	0x0000	"dvb-dibusb"	""
@@ -444,6 +446,11 @@
 0x0003	0x05a9	"ov511"	""
 0x0003	0x05c5	"digi_acceleport"	""
 0x0003	0x05cc	0x3000	0x0000	"pegasus"	""
+0x0003	0x05d8	0x8105	0x0000	"dvb-usb-dibusb-mb"	""
+0x0003	0x05d8	0x8106	0x0000	"dvb-usb-dibusb-mb"	""
+0x0003	0x05d8	0x8107	0x0000	"dvb-usb-dibusb-mb"	""
+0x0003	0x05d8	0x8108	0x0000	"dvb-usb-dibusb-mb"	""
+0x0003	0x05d8	0x8109	0x0000	"dvb-usb-dibusb-mc"	""
 0x0003	0x05d8	"dvb-dibusb"	""
 0x0003	0x05da	"microtek"	""
 0x0003	0x05dd	0xff31	0x0000	"at76c503-i3861"	""
@@ -477,6 +484,7 @@
 0x0003	0x067c	0x1022	0x0000	"prism2_usb"	""
 0x0003	0x067e	0x1001	0x0000	"ipaq"	""
 0x0003	0x0681	0x0005	0x0000	"idmouse"	""
+0x0003	0x0681	0x0010	0x0000	"idmouse"	""
 0x0003	0x0681	0x001b	0x0000	"at76c503-rfmd"	""
 0x0003	0x0686	0x4004	0x0000	"hpusbscsi"	""
 0x0003	0x0694	0x0001	0x0000	"legousbtower"	""
@@ -519,16 +527,21 @@
 0x0003	0x06cd	0x0121	0x0000	"keyspan"	""
 0x0003	0x06cd	0x012a	0x0000	"keyspan"	""
 0x0003	0x06d0	0x0622	0x0000	"usbnet"	""
+0x0003	0x06e1	0xa333	0x0000	"dvb-usb-dibusb-mb"	""
+0x0003	0x06e1	0xa334	0x0000	"dvb-usb-dibusb-mb"	""
 0x0003	0x06e1	"kaweth"	""
 0x0003	0x06f8	"iforce"	""
 0x0003	0x0707	0x0100	0x0000	"kaweth"	""
 0x0003	0x0707	0x0200	0x0000	"pegasus"	""
 0x0003	0x0707	0x0201	0x0000	"pegasus"	""
 0x0003	0x0710	"whiteheat"	""
+0x0003	0x0711	0x0900	0x0000	"sisusb"	""
 0x0003	0x0711	"mct_u232"	""
 0x0003	0x0729	0x1284	0x0000	"uss720"	""
 0x0003	0x0731	0x0528	0x0000	"pl2303"	""
 0x0003	0x0742	0x2008	0x0000	"ISDN:hfc_usb"	""
+0x0003	0x0742	0x2009	0x0000	"hfc_usb"	""
+0x0003	0x0742	0x200a	0x0000	"hfc_usb"	""
 0x0003	0x077b	0x2219	0x0000	"at76c503-rfmd"	""
 0x0003	0x077b	0x2226	0x0000	"usbnet"	""
 0x0003	0x077b	0x2227	0x0000	"at76c503-rfmd"	""
@@ -540,6 +553,7 @@
 0x0003	0x07aa	0x0012	0x0000	"prism2_usb"	""
 0x0003	0x07aa	0x0017	0x0000	"usbnet"	""
 0x0003	0x07aa	0x7613	0x0000	"at76c505-rfmd2958"	""
+0x0003	0x07b0	0x0006	0x0000	"hfc_usb"	""
 0x0003	0x07b0	0x0007	0x0000	"ISDN:hfc_usb"	""
 0x0003	0x07b8	0x110c	0x0000	"pegasus"	""
 0x0003	0x07b8	0x200c	0x0000	"pegasus"	""
@@ -556,8 +570,10 @@
 0x0003	0x07b8	0xabc1	0x0000	"pegasus"	""
 0x0003	0x07b8	0xb000	0x0000	"at76c503-rfmd"	""
 0x0003	0x07c9	0xb100	0x0000	"pegasus"	""
+0x0003	0x07ca	"dvb-usb-a800"	""
 0x0003	0x07cf	"ipaq"	""
 0x0003	0x07fa	0x0846	0x0000	"ISDN:hfc_usb"	""
+0x0003	0x07fa	0x0847	0x0000	"hfc_usb"	""
 0x0003	0x07fd	0x0001	0x0000	"usb-midi"	""
 0x0003	0x0813	0x0001	0x0000	"cpia_usb"	""
 0x0003	0x0813	0x0002	0x0000	"ov511"	""
@@ -715,12 +731,18 @@
 0x0003	0x0f98	0x0201	0x0000	"ipaq"	""
 0x0003	0x0fb8	"ipaq"	""
 0x0003	0x0fc5	0x1223	0x0000	"usbled"	""
+0x0003	0x1025	0x005e	0x0000	"dvb-usb-dibusb-mb"	""
+0x0003	0x1025	0x005f	0x0000	"dvb-usb-dibusb-mb"	""
 0x0003	0x1025	"dvb-dibusb"	""
 0x0003	0x1044	0x8002	0x0000	"pegasus"	""
 0x0003	0x1044	0x8003	0x0000	"at76c503-rfmd"	""
 0x0003	0x1044	0x8004	0x0000	"zd1201"	""
 0x0003	0x1046	0x9967	0x0000	"w9968cf"	""
 0x0003	0x1066	"ipaq"	""
+0x0003	0x10b8	0x0bb8	0x0000	"dvb-usb-dibusb-mb"	""
+0x0003	0x10b8	0x0bb9	0x0000	"dvb-usb-dibusb-mb"	""
+0x0003	0x10b8	0x0bc6	0x0000	"dvb-usb-dibusb-mc"	""
+0x0003	0x10b8	0x0bc7	0x0000	"dvb-usb-dibusb-mc"	""
 0x0003	0x10b8	"dvb-dibusb"	""
 0x0003	0x10bd	0x1427	0x0000	"kaweth"	""
 0x0003	0x1110	"eagle-usb"	""
@@ -743,12 +765,24 @@
 0x0003	0x1371	0x0014	0x0000	"at76c505-rfmd2958"	""
 0x0003	0x1371	0x5743	0x0000	"at76c503-rfmd"	""
 0x0003	0x13d2	0x0400	0x0000	"kaweth"	""
+0x0003	0x13d3	0x3201	0x0000	"dvb-usb-dibusb-mb"	""
+0x0003	0x13d3	0x3202	0x0000	"dvb-usb-dibusb-mb"	""
+0x0003	0x13d3	0x3205	0x0000	"dvb-usb-vp7045"	""
+0x0003	0x13d3	0x3206	0x0000	"dvb-usb-vp7045"	""
+0x0003	0x13d3	0x3223	0x0000	"dvb-usb-vp7045"	""
+0x0003	0x13d3	0x3224	0x0000	"dvb-usb-vp7045"	""
 0x0003	0x13d3	"dvb-dibusb"	""
 0x0003	0x1453	0x4026	0x0000	"pl2303"	""
 0x0003	0x145f	0x010c	0x0000	"dvb-dibusb"	""
 0x0003	0x1485	"kaweth"	""
+0x0003	0x14aa	0x0001	0x0000	"dvb-usb-dibusb-mb"	""
+0x0003	0x14aa	0x0002	0x0000	"dvb-usb-dibusb-mb"	""
+0x0003	0x14aa	0x0201	0x0000	"dvb-usb-dtt200u"	""
+0x0003	0x14aa	0x0301	0x0000	"dvb-usb-dtt200u"	""
 0x0003	0x14aa	"dvb-dibusb"	""
 0x0003	0x15e8	"pegasus"	""
+0x0003	0x15f4	0x0001	0x0000	"dvb-usb-umt-010"	""
+0x0003	0x15f4	0x0015	0x0000	"dvb-usb-umt-010"	""
 0x0003	0x15f4	"dvb-dibusb"	""
 0x0003	0x1604	"snd-usb-usx2y"	""
 0x0003	0x1608	0x0001	0x0000	"io_edgeport"	""
@@ -813,7 +847,12 @@
 0x0003	0x1668	0x6106	0x0000	"prism2_usb"	""
 0x0003	0x1668	0x7605	0x0000	"at76c503-rfmd"	""
 0x0003	0x1690	0x0601	0x0000	"ipaq"	""
+0x0003	0x1822	0x3201	0x0000	"dvb-usb-dibusb-mb"	""
+0x0003	0x1822	0x3202	0x0000	"dvb-usb-dibusb-mb"	""
 0x0003	0x1822	"dvb-dibusb"	""
+0x0003	0x182d	"sisusb"	""
+0x0003	0x185b	0xd000	0x0000	"dvb-usb-dibusb-mb"	""
+0x0003	0x185b	0xd001	0x0000	"dvb-usb-dibusb-mb"	""
 0x0003	0x185b	"dvb-dibusb"	""
 0x0003	0x1915	0x2233	0x0000	"at76c505-rfmd2958"	""
 0x0003	0x1915	0x2236	0x0000	"prism2_usb"	""
@@ -830,6 +869,7 @@
 0x0003	0x2001	0x4102	0x0000	"pegasus"	""
 0x0003	0x2001	0xabc1	0x0000	"pegasus"	""
 0x0003	0x2019	0x3220	0x0000	"at76c503-rfmd"	""
+0x0003	0x2040	"dvb-usb-nova-t-usb2"	""
 0x0003	0x22b8	"ipaq"	""
 0x0003	0x2478	0x2008	0x0000	"pl2303"	""
 0x0003	0x2821	0x3300	0x0000	"prism2_usb"	""
@@ -853,6 +893,10 @@
 0x0003	0x4428	0x0012	0x0000	"irda-usb"	""
 0x0003	0x4505	0x0010	0x0000	"ipaq"	""
 0x0003	0x4766	0x0001	0x0000	"visor"	""
+0x0003	0x5032	0x0bb8	0x0000	"dvb-usb-dibusb-mb"	""
+0x0003	0x5032	0x0bb9	0x0000	"dvb-usb-dibusb-mb"	""
+0x0003	0x5032	0x0fa0	0x0000	"dvb-usb-dibusb-mb"	""
+0x0003	0x5032	0x0fa1	0x0000	"dvb-usb-dibusb-mb"	""
 0x0003	0x5032	"dvb-dibusb"	""
 0x0003	0x50c2	0x4013	0x0000	"prism2_usb"	""
 0x0003	0x5e04	0xce00	0x0000	"ipaq"	""
@@ -862,6 +906,8 @@
 0x0003	0x8086	0x07d3	0x0000	"usbnet"	""
 0x0003	0x8086	0x1111	0x0000	"prism2_usb"	""
 0x0003	0x9016	0x182d	0x0000	"prism2_usb"	""
+0x0003	0xeb1a	0x17de	0x0000	"dvb-usb-dibusb-mb"	""
+0x0003	0xeb1a	0x17df	0x0000	"dvb-usb-dibusb-mb"	""
 0x0003	0xeb1a	"dvb-dibusb"	""
 0x0003	0xfff0	0xfff0	0x0000	"usbtest"	""
 0x000f	0x03ee	0x6901	0x0000	"usb-storage"	""