diff options
| author | Greg KH <greg@press.(none)> | 2005-10-11 09:47:45 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-10-11 09:47:45 -0700 |
| commit | 8e6b632075ab61c456c60f0d533dbfb8cb4926cb (patch) | |
| tree | 08e27153340b56a18ed91be8afc3f45735b2d92c /pci | |
| parent | bd538d074f6bd9fd185078a900dae04f932df9c3 (diff) | |
| download | patches-8e6b632075ab61c456c60f0d533dbfb8cb4926cb.tar.gz | |
2.6.14-rc4 update
Diffstat (limited to 'pci')
| -rw-r--r-- | pci/pci-ids-01.patch | 14 | ||||
| -rw-r--r-- | pci/pci-ids-03.patch | 303 |
2 files changed, 80 insertions, 237 deletions
diff --git a/pci/pci-ids-01.patch b/pci/pci-ids-01.patch index 6363c9f98d9dc..ee133f6419c7f 100644 --- a/pci/pci-ids-01.patch +++ b/pci/pci-ids-01.patch @@ -22,7 +22,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- --- gregkh-2.6.orig/include/linux/pci_ids.h +++ gregkh-2.6/include/linux/pci_ids.h -@@ -273,7 +273,6 @@ +@@ -274,7 +274,6 @@ #define PCI_DEVICE_ID_ATI_RAGE128_PP 0x5050 #define PCI_DEVICE_ID_ATI_RAGE128_PQ 0x5051 #define PCI_DEVICE_ID_ATI_RAGE128_PR 0x5052 @@ -30,7 +30,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #define PCI_DEVICE_ID_ATI_RAGE128_PS 0x5053 #define PCI_DEVICE_ID_ATI_RAGE128_PT 0x5054 #define PCI_DEVICE_ID_ATI_RAGE128_PU 0x5055 -@@ -516,16 +515,16 @@ +@@ -517,16 +516,16 @@ #define PCI_DEVICE_ID_AMD_VIPER_7413 0x7413 #define PCI_DEVICE_ID_AMD_VIPER_7414 0x7414 #define PCI_DEVICE_ID_AMD_OPUS_7440 0x7440 @@ -52,7 +52,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #define PCI_DEVICE_ID_AMD_8111_LAN 0x7462 #define PCI_DEVICE_ID_AMD_8111_LPC 0x7468 #define PCI_DEVICE_ID_AMD_8111_IDE 0x7469 -@@ -583,7 +582,6 @@ +@@ -585,7 +584,6 @@ #define PCI_DEVICE_ID_CT_65550 0x00e0 #define PCI_DEVICE_ID_CT_65554 0x00e4 #define PCI_DEVICE_ID_CT_65555 0x00e5 @@ -60,7 +60,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #define PCI_VENDOR_ID_MIRO 0x1031 #define PCI_DEVICE_ID_MIRO_36050 0x5601 -@@ -1194,7 +1192,6 @@ +@@ -1196,7 +1194,6 @@ #define PCI_DEVICE_ID_QUADRO_FX_GO1400 0x00cc #define PCI_DEVICE_ID_QUADRO_FX_1400 0x00ce #define PCI_DEVICE_ID_NVIDIA_NFORCE3 0x00d1 @@ -68,7 +68,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #define PCI_DEVICE_ID_NVIDIA_NFORCE3_SMBUS 0x00d4 #define PCI_DEVICE_ID_NVIDIA_NFORCE3_IDE 0x00d5 #define PCI_DEVICE_ID_NVIDIA_NVENET_3 0x00d6 -@@ -1620,7 +1617,7 @@ +@@ -1622,7 +1619,7 @@ #define PCI_DEVICE_ID_SERVERWORKS_HT1000IDE 0x0214 #define PCI_DEVICE_ID_SERVERWORKS_CSB6IDE2 0x0217 #define PCI_DEVICE_ID_SERVERWORKS_OSB4USB 0x0220 @@ -77,7 +77,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #define PCI_DEVICE_ID_SERVERWORKS_CSB6USB 0x0221 #define PCI_DEVICE_ID_SERVERWORKS_CSB6LPC 0x0227 #define PCI_DEVICE_ID_SERVERWORKS_GCLE 0x0225 -@@ -1789,10 +1786,6 @@ +@@ -1791,10 +1788,6 @@ #define PCI_DEVICE_ID_PC300_TE_M_2 0x0320 #define PCI_DEVICE_ID_PC300_TE_M_1 0x0321 @@ -88,7 +88,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #define PCI_VENDOR_ID_ESSENTIAL 0x120f #define PCI_DEVICE_ID_ESSENTIAL_ROADRUNNER 0x0001 -@@ -2337,16 +2330,13 @@ +@@ -2339,16 +2332,13 @@ #define PCI_VENDOR_ID_DUNORD 0x5544 #define PCI_DEVICE_ID_DUNORD_I3000 0x0001 diff --git a/pci/pci-ids-03.patch b/pci/pci-ids-03.patch index 4b7e737522ea0..c232c023527ba 100644 --- a/pci/pci-ids-03.patch +++ b/pci/pci-ids-03.patch @@ -15,8 +15,8 @@ with 'make allmodconfig' Signed-off-by: Grant Coady <gcoady@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - include/linux/pci_ids.h | 621 ------------------------------------------------ - 1 file changed, 621 deletions(-) + include/linux/pci_ids.h | 540 ------------------------------------------------ + 1 file changed, 540 deletions(-) --- --- gregkh-2.6.orig/include/linux/pci_ids.h @@ -31,69 +31,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #define PCI_DEVICE_ID_COMPAQ_TACHYON 0xa0fc #define PCI_DEVICE_ID_COMPAQ_SMART2P 0xae10 #define PCI_DEVICE_ID_COMPAQ_NETEL100 0xae32 -@@ -170,61 +167,25 @@ - #define PCI_DEVICE_ID_LSI_53C1010_66 0x0021 - #define PCI_DEVICE_ID_LSI_53C1030 0x0030 - #define PCI_DEVICE_ID_LSI_1030_53C1035 0x0032 --#define PCI_DEVICE_ID_LSI_53C1035 0x0040 - #define PCI_DEVICE_ID_NCR_53C875J 0x008f - #define PCI_DEVICE_ID_LSI_FC909 0x0621 - #define PCI_DEVICE_ID_LSI_FC929 0x0622 --#define PCI_DEVICE_ID_LSI_FC929_LAN 0x0623 - #define PCI_DEVICE_ID_LSI_FC919 0x0624 --#define PCI_DEVICE_ID_LSI_FC919_LAN 0x0625 - #define PCI_DEVICE_ID_LSI_FC929X 0x0626 - #define PCI_DEVICE_ID_LSI_FC939X 0x0642 - #define PCI_DEVICE_ID_LSI_FC949X 0x0640 - #define PCI_DEVICE_ID_LSI_FC919X 0x0628 --#define PCI_DEVICE_ID_NCR_YELLOWFIN 0x0701 --#define PCI_DEVICE_ID_LSI_61C102 0x0901 --#define PCI_DEVICE_ID_LSI_63C815 0x1000 - #define PCI_DEVICE_ID_LSI_SAS1064 0x0050 - #define PCI_DEVICE_ID_LSI_SAS1066 0x005E - #define PCI_DEVICE_ID_LSI_SAS1068 0x0054 --#define PCI_DEVICE_ID_LSI_SAS1064A 0x005C - #define PCI_DEVICE_ID_LSI_SAS1064E 0x0056 - #define PCI_DEVICE_ID_LSI_SAS1066E 0x005A - #define PCI_DEVICE_ID_LSI_SAS1068E 0x0058 --#define PCI_DEVICE_ID_LSI_SAS1078 0x0060 - - #define PCI_VENDOR_ID_ATI 0x1002 - /* Mach64 */ --#define PCI_DEVICE_ID_ATI_68800 0x4158 --#define PCI_DEVICE_ID_ATI_215CT222 0x4354 --#define PCI_DEVICE_ID_ATI_210888CX 0x4358 --#define PCI_DEVICE_ID_ATI_215ET222 0x4554 - /* Mach64 / Rage */ --#define PCI_DEVICE_ID_ATI_215GB 0x4742 --#define PCI_DEVICE_ID_ATI_215GD 0x4744 --#define PCI_DEVICE_ID_ATI_215GI 0x4749 --#define PCI_DEVICE_ID_ATI_215GP 0x4750 --#define PCI_DEVICE_ID_ATI_215GQ 0x4751 --#define PCI_DEVICE_ID_ATI_215XL 0x4752 --#define PCI_DEVICE_ID_ATI_215GT 0x4754 --#define PCI_DEVICE_ID_ATI_215GTB 0x4755 --#define PCI_DEVICE_ID_ATI_215_IV 0x4756 --#define PCI_DEVICE_ID_ATI_215_IW 0x4757 --#define PCI_DEVICE_ID_ATI_215_IZ 0x475A --#define PCI_DEVICE_ID_ATI_210888GX 0x4758 --#define PCI_DEVICE_ID_ATI_215_LB 0x4c42 --#define PCI_DEVICE_ID_ATI_215_LD 0x4c44 --#define PCI_DEVICE_ID_ATI_215_LG 0x4c47 --#define PCI_DEVICE_ID_ATI_215_LI 0x4c49 --#define PCI_DEVICE_ID_ATI_215_LM 0x4c4D --#define PCI_DEVICE_ID_ATI_215_LN 0x4c4E --#define PCI_DEVICE_ID_ATI_215_LR 0x4c52 --#define PCI_DEVICE_ID_ATI_215_LS 0x4c53 --#define PCI_DEVICE_ID_ATI_264_LT 0x4c54 - /* Mach64 VT */ --#define PCI_DEVICE_ID_ATI_264VT 0x5654 --#define PCI_DEVICE_ID_ATI_264VU 0x5655 --#define PCI_DEVICE_ID_ATI_264VV 0x5656 - /* Rage128 GL */ - #define PCI_DEVICE_ID_ATI_RAGE128_RE 0x5245 - #define PCI_DEVICE_ID_ATI_RAGE128_RF 0x5246 -@@ -280,8 +241,6 @@ +@@ -281,8 +278,6 @@ #define PCI_DEVICE_ID_ATI_RAGE128_PW 0x5057 #define PCI_DEVICE_ID_ATI_RAGE128_PX 0x5058 /* Rage128 M4 */ @@ -102,7 +40,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> /* Radeon R100 */ #define PCI_DEVICE_ID_ATI_RADEON_QD 0x5144 #define PCI_DEVICE_ID_ATI_RADEON_QE 0x5145 -@@ -302,32 +261,22 @@ +@@ -303,32 +298,22 @@ #define PCI_DEVICE_ID_ATI_RADEON_QW 0x5157 #define PCI_DEVICE_ID_ATI_RADEON_QX 0x5158 /* Radeon NV-100 */ @@ -135,7 +73,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> /* Radeon M6 */ #define PCI_DEVICE_ID_ATI_RADEON_LY 0x4c59 #define PCI_DEVICE_ID_ATI_RADEON_LZ 0x4c5a -@@ -340,10 +289,6 @@ +@@ -341,10 +326,6 @@ #define PCI_DEVICE_ID_ATI_RADEON_Lf 0x4c66 #define PCI_DEVICE_ID_ATI_RADEON_Lg 0x4c67 /* Radeon */ @@ -146,7 +84,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> /* RadeonIGP */ #define PCI_DEVICE_ID_ATI_RS100 0xcab0 #define PCI_DEVICE_ID_ATI_RS200 0xcab2 -@@ -444,34 +389,18 @@ +@@ -445,34 +426,18 @@ #define PCI_DEVICE_ID_CIRRUS_5465 0x00d6 #define PCI_DEVICE_ID_CIRRUS_6729 0x1100 #define PCI_DEVICE_ID_CIRRUS_6832 0x1110 @@ -181,7 +119,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #define PCI_DEVICE_ID_IBM_ICOM_DEV_ID_1 0x0031 #define PCI_DEVICE_ID_IBM_ICOM_DEV_ID_2 0x0219 #define PCI_DEVICE_ID_IBM_ICOM_V2_TWO_PORTS_RVX 0x021A -@@ -482,7 +411,6 @@ +@@ -483,7 +448,6 @@ #define PCI_DEVICE_ID_COMPEX2_100VG 0x0005 #define PCI_VENDOR_ID_WD 0x101c @@ -189,7 +127,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #define PCI_DEVICE_ID_WD_90C 0xc24a #define PCI_VENDOR_ID_AMI 0x101e -@@ -499,33 +427,18 @@ +@@ -500,33 +464,18 @@ #define PCI_DEVICE_ID_AMD_FE_GATE_7006 0x7006 #define PCI_DEVICE_ID_AMD_FE_GATE_7007 0x7007 #define PCI_DEVICE_ID_AMD_FE_GATE_700C 0x700C @@ -223,102 +161,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #define PCI_DEVICE_ID_AMD_8111_LPC 0x7468 #define PCI_DEVICE_ID_AMD_8111_IDE 0x7469 #define PCI_DEVICE_ID_AMD_8111_SMBUS2 0x746a -@@ -537,94 +450,49 @@ - #define PCI_VENDOR_ID_TRIDENT 0x1023 - #define PCI_DEVICE_ID_TRIDENT_4DWAVE_DX 0x2000 - #define PCI_DEVICE_ID_TRIDENT_4DWAVE_NX 0x2001 --#define PCI_DEVICE_ID_TRIDENT_9320 0x9320 --#define PCI_DEVICE_ID_TRIDENT_9388 0x9388 --#define PCI_DEVICE_ID_TRIDENT_9397 0x9397 --#define PCI_DEVICE_ID_TRIDENT_939A 0x939A --#define PCI_DEVICE_ID_TRIDENT_9520 0x9520 --#define PCI_DEVICE_ID_TRIDENT_9525 0x9525 --#define PCI_DEVICE_ID_TRIDENT_9420 0x9420 --#define PCI_DEVICE_ID_TRIDENT_9440 0x9440 --#define PCI_DEVICE_ID_TRIDENT_9660 0x9660 --#define PCI_DEVICE_ID_TRIDENT_9750 0x9750 --#define PCI_DEVICE_ID_TRIDENT_9850 0x9850 --#define PCI_DEVICE_ID_TRIDENT_9880 0x9880 --#define PCI_DEVICE_ID_TRIDENT_8400 0x8400 --#define PCI_DEVICE_ID_TRIDENT_8420 0x8420 --#define PCI_DEVICE_ID_TRIDENT_8500 0x8500 - --#define PCI_VENDOR_ID_AI 0x1025 --#define PCI_DEVICE_ID_AI_M1435 0x1435 - - #define PCI_VENDOR_ID_DELL 0x1028 - #define PCI_DEVICE_ID_DELL_RACIII 0x0008 - #define PCI_DEVICE_ID_DELL_RAC4 0x0012 - - #define PCI_VENDOR_ID_MATROX 0x102B --#define PCI_DEVICE_ID_MATROX_MGA_2 0x0518 - #define PCI_DEVICE_ID_MATROX_MIL 0x0519 - #define PCI_DEVICE_ID_MATROX_MYS 0x051A - #define PCI_DEVICE_ID_MATROX_MIL_2 0x051b - #define PCI_DEVICE_ID_MATROX_MIL_2_AGP 0x051f --#define PCI_DEVICE_ID_MATROX_MGA_IMP 0x0d10 - #define PCI_DEVICE_ID_MATROX_G100_MM 0x1000 - #define PCI_DEVICE_ID_MATROX_G100_AGP 0x1001 - #define PCI_DEVICE_ID_MATROX_G200_PCI 0x0520 - #define PCI_DEVICE_ID_MATROX_G200_AGP 0x0521 - #define PCI_DEVICE_ID_MATROX_G400 0x0525 - #define PCI_DEVICE_ID_MATROX_G550 0x2527 --#define PCI_DEVICE_ID_MATROX_VIA 0x4536 - - #define PCI_VENDOR_ID_CT 0x102c - #define PCI_DEVICE_ID_CT_69000 0x00c0 --#define PCI_DEVICE_ID_CT_65545 0x00d8 --#define PCI_DEVICE_ID_CT_65548 0x00dc - #define PCI_DEVICE_ID_CT_65550 0x00e0 --#define PCI_DEVICE_ID_CT_65554 0x00e4 --#define PCI_DEVICE_ID_CT_65555 0x00e5 - - #define PCI_VENDOR_ID_MIRO 0x1031 --#define PCI_DEVICE_ID_MIRO_36050 0x5601 - #define PCI_DEVICE_ID_MIRO_DC10PLUS 0x7efe - #define PCI_DEVICE_ID_MIRO_DC30PLUS 0xd801 - - #define PCI_VENDOR_ID_NEC 0x1033 - #define PCI_DEVICE_ID_NEC_CBUS_1 0x0001 /* PCI-Cbus Bridge */ --#define PCI_DEVICE_ID_NEC_LOCAL 0x0002 /* Local Bridge */ --#define PCI_DEVICE_ID_NEC_ATM 0x0003 /* ATM LAN Controller */ --#define PCI_DEVICE_ID_NEC_R4000 0x0004 /* R4000 Bridge */ --#define PCI_DEVICE_ID_NEC_486 0x0005 /* 486 Like Peripheral Bus Bridge */ --#define PCI_DEVICE_ID_NEC_ACCEL_1 0x0006 /* Graphic Accelerator */ --#define PCI_DEVICE_ID_NEC_UXBUS 0x0007 /* UX-Bus Bridge */ --#define PCI_DEVICE_ID_NEC_ACCEL_2 0x0008 /* Graphic Accelerator */ --#define PCI_DEVICE_ID_NEC_GRAPH 0x0009 /* PCI-CoreGraph Bridge */ --#define PCI_DEVICE_ID_NEC_VL 0x0016 /* PCI-VL Bridge */ --#define PCI_DEVICE_ID_NEC_STARALPHA2 0x002c /* STAR ALPHA2 */ - #define PCI_DEVICE_ID_NEC_CBUS_2 0x002d /* PCI-Cbus Bridge */ --#define PCI_DEVICE_ID_NEC_USB 0x0035 /* PCI-USB Host */ - #define PCI_DEVICE_ID_NEC_CBUS_3 0x003b - #define PCI_DEVICE_ID_NEC_NAPCCARD 0x003e --#define PCI_DEVICE_ID_NEC_PCX2 0x0046 /* PowerVR */ - #define PCI_DEVICE_ID_NEC_NILE4 0x005a --#define PCI_DEVICE_ID_NEC_VRC5476 0x009b - #define PCI_DEVICE_ID_NEC_VRC4173 0x00a5 - #define PCI_DEVICE_ID_NEC_VRC5477_AC97 0x00a6 --#define PCI_DEVICE_ID_NEC_PC9821CS01 0x800c /* PC-9821-CS01 */ --#define PCI_DEVICE_ID_NEC_PC9821NRB06 0x800d /* PC-9821NR-B06 */ - - #define PCI_VENDOR_ID_FD 0x1036 - #define PCI_DEVICE_ID_FD_36C70 0x0000 - - #define PCI_VENDOR_ID_SI 0x1039 - #define PCI_DEVICE_ID_SI_5591_AGP 0x0001 --#define PCI_DEVICE_ID_SI_6202 0x0002 - #define PCI_DEVICE_ID_SI_503 0x0008 --#define PCI_DEVICE_ID_SI_ACPI 0x0009 - #define PCI_DEVICE_ID_SI_SMBUS 0x0016 - #define PCI_DEVICE_ID_SI_LPC 0x0018 --#define PCI_DEVICE_ID_SI_5597_VGA 0x0200 --#define PCI_DEVICE_ID_SI_6205 0x0205 --#define PCI_DEVICE_ID_SI_501 0x0406 - #define PCI_DEVICE_ID_SI_496 0x0496 - #define PCI_DEVICE_ID_SI_300 0x0300 - #define PCI_DEVICE_ID_SI_315H 0x0310 -@@ -635,7 +503,6 @@ +@@ -637,7 +586,6 @@ #define PCI_DEVICE_ID_SI_550 0x0550 #define PCI_DEVICE_ID_SI_540_VGA 0x5300 #define PCI_DEVICE_ID_SI_550_VGA 0x5315 @@ -326,7 +169,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #define PCI_DEVICE_ID_SI_620 0x0620 #define PCI_DEVICE_ID_SI_630 0x0630 #define PCI_DEVICE_ID_SI_633 0x0633 -@@ -646,30 +513,22 @@ +@@ -648,30 +596,22 @@ #define PCI_DEVICE_ID_SI_648 0x0648 #define PCI_DEVICE_ID_SI_650 0x0650 #define PCI_DEVICE_ID_SI_651 0x0651 @@ -357,7 +200,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #define PCI_DEVICE_ID_SI_5511 0x5511 #define PCI_DEVICE_ID_SI_5513 0x5513 #define PCI_DEVICE_ID_SI_5518 0x5518 -@@ -681,10 +540,6 @@ +@@ -683,10 +623,6 @@ #define PCI_DEVICE_ID_SI_5597 0x5597 #define PCI_DEVICE_ID_SI_5598 0x5598 #define PCI_DEVICE_ID_SI_5600 0x5600 @@ -368,7 +211,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #define PCI_DEVICE_ID_SI_7012 0x7012 #define PCI_DEVICE_ID_SI_7013 0x7013 #define PCI_DEVICE_ID_SI_7016 0x7016 -@@ -705,23 +560,18 @@ +@@ -707,23 +643,18 @@ #define PCI_DEVICE_ID_HP_DIVA_TOSCA1 0x1049 #define PCI_DEVICE_ID_HP_DIVA_TOSCA2 0x104A #define PCI_DEVICE_ID_HP_DIVA_MAESTRO 0x104B @@ -392,7 +235,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #define PCI_DEVICE_ID_HP_CISSC 0x3230 #define PCI_DEVICE_ID_HP_CISSD 0x3238 #define PCI_DEVICE_ID_HP_ZX2_IOC 0x4031 -@@ -729,8 +579,6 @@ +@@ -731,8 +662,6 @@ #define PCI_VENDOR_ID_PCTECH 0x1042 #define PCI_DEVICE_ID_PCTECH_RZ1000 0x1000 #define PCI_DEVICE_ID_PCTECH_RZ1001 0x1001 @@ -401,7 +244,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #define PCI_DEVICE_ID_PCTECH_SAMURAI_IDE 0x3020 #define PCI_VENDOR_ID_ASUSTEK 0x1043 -@@ -740,24 +588,15 @@ +@@ -742,24 +671,15 @@ #define PCI_DEVICE_ID_DPT 0xa400 #define PCI_VENDOR_ID_OPTI 0x1045 @@ -426,7 +269,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #define PCI_VENDOR_ID_BUSLOGIC 0x104B #define PCI_DEVICE_ID_BUSLOGIC_MULTIMASTER_NC 0x0140 -@@ -765,7 +604,6 @@ +@@ -767,7 +687,6 @@ #define PCI_DEVICE_ID_BUSLOGIC_FLASHPOINT 0x8130 #define PCI_VENDOR_ID_TI 0x104c @@ -434,7 +277,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #define PCI_DEVICE_ID_TI_TVP4020 0x3d07 #define PCI_DEVICE_ID_TI_4450 0x8011 #define PCI_DEVICE_ID_TI_XX21_XX11 0x8031 -@@ -799,14 +637,10 @@ +@@ -801,14 +720,10 @@ #define PCI_DEVICE_ID_TI_X420 0xac8e #define PCI_VENDOR_ID_SONY 0x104d @@ -449,7 +292,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #define PCI_DEVICE_ID_WINBOND2_89C940F 0x5a5a #define PCI_DEVICE_ID_WINBOND2_6692 0x6692 -@@ -815,19 +649,15 @@ +@@ -817,19 +732,15 @@ #define PCI_VENDOR_ID_EFAR 0x1055 #define PCI_DEVICE_ID_EFAR_SLC90E66_1 0x9130 @@ -469,7 +312,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #define PCI_DEVICE_ID_MOTOROLA_HARRIER 0x480b #define PCI_DEVICE_ID_MOTOROLA_MPC5200 0x5803 -@@ -838,33 +668,19 @@ +@@ -840,33 +751,19 @@ #define PCI_DEVICE_ID_PROMISE_20262 0x4d38 #define PCI_DEVICE_ID_PROMISE_20263 0x0D38 #define PCI_DEVICE_ID_PROMISE_20268 0x4d68 @@ -503,7 +346,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #define PCI_VENDOR_ID_MYLEX 0x1069 #define PCI_DEVICE_ID_MYLEX_DAC960_P 0x0001 -@@ -875,37 +691,26 @@ +@@ -877,37 +774,26 @@ #define PCI_DEVICE_ID_MYLEX_DAC960_BA 0xBA56 #define PCI_DEVICE_ID_MYLEX_DAC960_GEM 0xB166 @@ -541,7 +384,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #define PCI_DEVICE_ID_APPLE_U3L_AGP 0x0058 #define PCI_DEVICE_ID_APPLE_U3H_AGP 0x0059 #define PCI_DEVICE_ID_APPLE_TIGON3 0x1645 -@@ -918,12 +723,9 @@ +@@ -920,12 +806,9 @@ #define PCI_DEVICE_ID_YAMAHA_744 0x0010 #define PCI_DEVICE_ID_YAMAHA_754 0x0012 @@ -554,7 +397,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #define PCI_DEVICE_ID_QLOGIC_ISP2100 0x2100 #define PCI_DEVICE_ID_QLOGIC_ISP2200 0x2200 #define PCI_DEVICE_ID_QLOGIC_ISP2300 0x2300 -@@ -941,32 +743,20 @@ +@@ -943,32 +826,20 @@ #define PCI_DEVICE_ID_CYRIX_PCI_MASTER 0x0001 #define PCI_DEVICE_ID_CYRIX_5520 0x0002 #define PCI_DEVICE_ID_CYRIX_5530_LEGACY 0x0100 @@ -587,7 +430,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #define PCI_VENDOR_ID_SUN 0x108e #define PCI_DEVICE_ID_SUN_EBUS 0x1000 -@@ -985,49 +775,31 @@ +@@ -987,49 +858,31 @@ #define PCI_DEVICE_ID_SUN_CASSINI 0xabba #define PCI_VENDOR_ID_CMD 0x1095 @@ -637,7 +480,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #define PCI_VENDOR_ID_PLX 0x10b5 #define PCI_DEVICE_ID_PLX_R685 0x1030 -@@ -1038,33 +810,19 @@ +@@ -1040,33 +893,19 @@ #define PCI_DEVICE_ID_PLX_DJINN_ITOO 0x1151 #define PCI_DEVICE_ID_PLX_R753 0x1152 #define PCI_DEVICE_ID_PLX_OLITEC 0x1187 @@ -671,7 +514,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #define PCI_DEVICE_ID_3COM_3CR990 0x9900 #define PCI_DEVICE_ID_3COM_3CR990_TX_95 0x9902 #define PCI_DEVICE_ID_3COM_3CR990_TX_97 0x9903 -@@ -1074,24 +832,11 @@ +@@ -1076,24 +915,11 @@ #define PCI_DEVICE_ID_3COM_3CR990SVR97 0x9909 #define PCI_DEVICE_ID_3COM_3CR990SVR 0x990a @@ -696,7 +539,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #define PCI_DEVICE_ID_AL_M1563 0x1563 #define PCI_DEVICE_ID_AL_M1621 0x1621 #define PCI_DEVICE_ID_AL_M1631 0x1631 -@@ -1104,49 +849,23 @@ +@@ -1106,49 +932,23 @@ #define PCI_DEVICE_ID_AL_M1681 0x1681 #define PCI_DEVICE_ID_AL_M1683 0x1683 #define PCI_DEVICE_ID_AL_M1689 0x1689 @@ -746,7 +589,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #define PCI_VENDOR_ID_NVIDIA 0x10de #define PCI_DEVICE_ID_NVIDIA_TNT 0x0020 -@@ -1278,7 +997,6 @@ +@@ -1280,7 +1080,6 @@ #define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP55_SATA2 0x037F #define PCI_DEVICE_ID_NVIDIA_NVENET_12 0x0268 #define PCI_DEVICE_ID_NVIDIA_NVENET_13 0x0269 @@ -754,7 +597,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #define PCI_DEVICE_ID_NVIDIA_GEFORCE4_TI_4800 0x0280 #define PCI_DEVICE_ID_NVIDIA_GEFORCE4_TI_4800_8X 0x0281 #define PCI_DEVICE_ID_NVIDIA_GEFORCE4_TI_4800SE 0x0282 -@@ -1329,24 +1047,13 @@ +@@ -1331,24 +1130,13 @@ #define PCI_DEVICE_ID_NVIDIA_NVENET_15 0x0373 #define PCI_VENDOR_ID_IMS 0x10e0 @@ -779,7 +622,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #define PCI_DEVICE_ID_INTERG_1682 0x1682 #define PCI_DEVICE_ID_INTERG_2000 0x2000 #define PCI_DEVICE_ID_INTERG_2010 0x2010 -@@ -1354,27 +1061,18 @@ +@@ -1356,27 +1144,18 @@ #define PCI_DEVICE_ID_INTERG_5050 0x5050 #define PCI_VENDOR_ID_REALTEK 0x10ec @@ -807,7 +650,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #define PCI_VENDOR_ID_CREATIVE 0x1102 // duplicate: ECTIVA #define PCI_DEVICE_ID_CREATIVE_EMU10K1 0x0002 -@@ -1402,36 +1100,25 @@ +@@ -1404,36 +1183,25 @@ #define PCI_DEVICE_ID_VIA_8363_0 0x0305 #define PCI_DEVICE_ID_VIA_8371_0 0x0391 #define PCI_DEVICE_ID_VIA_8501_0 0x0501 @@ -844,7 +687,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #define PCI_DEVICE_ID_VIA_8233_0 0x3074 #define PCI_DEVICE_ID_VIA_8633_0 0x3091 #define PCI_DEVICE_ID_VIA_8367_0 0x3099 -@@ -1449,38 +1136,23 @@ +@@ -1451,38 +1219,23 @@ #define PCI_DEVICE_ID_VIA_XN266 0x3156 #define PCI_DEVICE_ID_VIA_8754C_0 0x3168 #define PCI_DEVICE_ID_VIA_8235 0x3177 @@ -883,7 +726,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #define PCI_VENDOR_ID_VORTEX 0x1119 #define PCI_DEVICE_ID_VORTEX_GDT60x0 0x0000 -@@ -1503,18 +1175,6 @@ +@@ -1505,18 +1258,6 @@ #define PCI_DEVICE_ID_VORTEX_GDT6557RP 0x0103 #define PCI_DEVICE_ID_VORTEX_GDT6x11RP 0x0104 #define PCI_DEVICE_ID_VORTEX_GDT6x21RP 0x0105 @@ -902,7 +745,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #define PCI_VENDOR_ID_EF 0x111a #define PCI_DEVICE_ID_EF_ATM_FPGA 0x0000 -@@ -1526,21 +1186,15 @@ +@@ -1528,21 +1269,15 @@ #define PCI_DEVICE_ID_IDT_IDT77201 0x0001 #define PCI_VENDOR_ID_FORE 0x1127 @@ -924,7 +767,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #define PCI_DEVICE_ID_EICON_DIVA20_U 0xe004 #define PCI_DEVICE_ID_EICON_DIVA201 0xe005 #define PCI_DEVICE_ID_EICON_DIVA202 0xe00b -@@ -1552,35 +1206,17 @@ +@@ -1554,35 +1289,17 @@ #define PCI_VENDOR_ID_ZIATECH 0x1138 #define PCI_DEVICE_ID_ZIATECH_5550_HC 0x5550 @@ -960,7 +803,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #define PCI_DEVICE_ID_DIGI_DF_M_IOM2_E 0x0070 #define PCI_DEVICE_ID_DIGI_DF_M_E 0x0071 #define PCI_DEVICE_ID_DIGI_DF_M_IOM2_A 0x0072 -@@ -1590,23 +1226,15 @@ +@@ -1592,23 +1309,15 @@ #define PCI_DEVICE_ID_NEO_2RJ45 0x00CA #define PCI_DEVICE_ID_NEO_2RJ45PRI 0x00CB @@ -984,7 +827,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #define PCI_DEVICE_ID_SERVERWORKS_GCNB_LE 0x0017 #define PCI_DEVICE_ID_SERVERWORKS_OSB4 0x0200 #define PCI_DEVICE_ID_SERVERWORKS_CSB5 0x0201 -@@ -1616,13 +1244,7 @@ +@@ -1618,13 +1327,7 @@ #define PCI_DEVICE_ID_SERVERWORKS_CSB6IDE 0x0213 #define PCI_DEVICE_ID_SERVERWORKS_HT1000IDE 0x0214 #define PCI_DEVICE_ID_SERVERWORKS_CSB6IDE2 0x0217 @@ -998,7 +841,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #define PCI_VENDOR_ID_SBE 0x1176 #define PCI_DEVICE_ID_SBE_WANXL100 0x0301 -@@ -1633,17 +1255,12 @@ +@@ -1635,17 +1338,12 @@ #define PCI_DEVICE_ID_TOSHIBA_PICCOLO 0x0102 #define PCI_DEVICE_ID_TOSHIBA_PICCOLO_1 0x0103 #define PCI_DEVICE_ID_TOSHIBA_PICCOLO_2 0x0105 @@ -1016,7 +859,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #define PCI_DEVICE_ID_TOSHIBA_TC86C001_MISC 0x0108 #define PCI_DEVICE_ID_TOSHIBA_SPIDER_NET 0x01b3 -@@ -1658,7 +1275,6 @@ +@@ -1660,7 +1358,6 @@ #define PCI_DEVICE_ID_DLINK_DGE510T 0x4c00 #define PCI_VENDOR_ID_ARTOP 0x1191 @@ -1024,7 +867,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #define PCI_DEVICE_ID_ARTOP_ATP850UF 0x0005 #define PCI_DEVICE_ID_ARTOP_ATP860 0x0006 #define PCI_DEVICE_ID_ARTOP_ATP860R 0x0007 -@@ -1671,16 +1287,11 @@ +@@ -1673,16 +1370,11 @@ #define PCI_DEVICE_ID_ARTOP_AEC7612D 0x8040 #define PCI_DEVICE_ID_ARTOP_AEC7612SUW 0x8050 #define PCI_DEVICE_ID_ARTOP_8060 0x8060 @@ -1041,7 +884,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #define PCI_VENDOR_ID_FUJITSU_ME 0x119e #define PCI_DEVICE_ID_FUJITSU_FS155 0x0001 -@@ -1690,61 +1301,41 @@ +@@ -1692,61 +1384,41 @@ #define PCI_SUBDEVICE_ID_KEYSPAN_SX2 0x5334 #define PCI_VENDOR_ID_MARVELL 0x11ab @@ -1103,7 +946,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #define PCI_VENDOR_ID_RP 0x11fe #define PCI_DEVICE_ID_RP32INTF 0x0001 -@@ -1758,7 +1349,6 @@ +@@ -1760,7 +1432,6 @@ #define PCI_DEVICE_ID_RP16SNI 0x0009 #define PCI_DEVICE_ID_RPP4 0x000A #define PCI_DEVICE_ID_RPP8 0x000B @@ -1111,7 +954,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #define PCI_DEVICE_ID_RP4M 0x000D #define PCI_DEVICE_ID_RP2_232 0x000E #define PCI_DEVICE_ID_RP2_422 0x000F -@@ -1802,10 +1392,7 @@ +@@ -1804,10 +1475,7 @@ #define PCI_DEVICE_ID_3DFX_VOODOO3 0x0005 #define PCI_DEVICE_ID_3DFX_VOODOO5 0x0009 @@ -1122,7 +965,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #define PCI_VENDOR_ID_AVM 0x1244 #define PCI_DEVICE_ID_AVM_B1 0x0700 -@@ -1815,19 +1402,8 @@ +@@ -1817,19 +1485,8 @@ #define PCI_DEVICE_ID_AVM_C2 0x1100 #define PCI_DEVICE_ID_AVM_T1 0x1200 @@ -1142,7 +985,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> /* Allied Telesyn */ #define PCI_VENDOR_ID_AT 0x1259 -@@ -1836,7 +1412,6 @@ +@@ -1838,7 +1495,6 @@ #define PCI_VENDOR_ID_ESS 0x125d #define PCI_DEVICE_ID_ESS_ESS1968 0x1968 @@ -1150,7 +993,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #define PCI_DEVICE_ID_ESS_ESS1978 0x1978 #define PCI_DEVICE_ID_ESS_ALLEGRO_1 0x1988 #define PCI_DEVICE_ID_ESS_ALLEGRO 0x1989 -@@ -1849,11 +1424,7 @@ +@@ -1851,11 +1507,7 @@ #define PCI_VENDOR_ID_SATSAGEM 0x1267 #define PCI_DEVICE_ID_SATSAGEM_NICCY 0x1016 @@ -1162,7 +1005,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #define PCI_VENDOR_ID_ENSONIQ 0x1274 #define PCI_DEVICE_ID_ENSONIQ_CT5880 0x5880 -@@ -1874,13 +1445,10 @@ +@@ -1876,13 +1528,10 @@ #define PCI_DEVICE_ID_ITE_IT8330G_0 0xe886 /* formerly Platform Tech */ @@ -1176,7 +1019,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #define PCI_SUBVENDOR_ID_CONNECT_TECH 0x12c4 #define PCI_SUBDEVICE_ID_CONNECT_TECH_BH8_232 0x0001 -@@ -1895,8 +1463,6 @@ +@@ -1897,8 +1546,6 @@ #define PCI_SUBDEVICE_ID_CONNECT_TECH_BH081101V1 0x000A #define PCI_SUBDEVICE_ID_CONNECT_TECH_BH041101V1 0x000B @@ -1185,7 +1028,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #define PCI_VENDOR_ID_NVIDIA_SGS 0x12d2 #define PCI_DEVICE_ID_NVIDIA_SGS_RIVA128 0x0018 -@@ -1918,8 +1484,6 @@ +@@ -1920,8 +1567,6 @@ #define PCI_VENDOR_ID_ELECTRONICDESIGNGMBH 0x12f8 #define PCI_DEVICE_ID_LML_33R10 0x8a02 @@ -1194,7 +1037,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #define PCI_VENDOR_ID_SIIG 0x131f #define PCI_SUBVENDOR_ID_SIIG 0x131f -@@ -1962,8 +1526,6 @@ +@@ -1964,8 +1609,6 @@ #define PCI_DEVICE_ID_SIIG_2S1P_20x_850 0x2062 #define PCI_SUBDEVICE_ID_SIIG_QUARTET_SERIAL 0x2050 @@ -1203,7 +1046,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #define PCI_VENDOR_ID_DOMEX 0x134a #define PCI_DEVICE_ID_DOMEX_DMX3191D 0x0001 -@@ -1971,8 +1533,6 @@ +@@ -1973,8 +1616,6 @@ #define PCI_VENDOR_ID_QUATECH 0x135C #define PCI_DEVICE_ID_QUATECH_QSC100 0x0010 #define PCI_DEVICE_ID_QUATECH_DSC100 0x0020 @@ -1212,7 +1055,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #define PCI_DEVICE_ID_QUATECH_ESC100D 0x0050 #define PCI_DEVICE_ID_QUATECH_ESC100M 0x0060 -@@ -1991,7 +1551,6 @@ +@@ -1993,7 +1634,6 @@ #define PCI_SUBDEVICE_ID_HYPERCOPE_ERGO 0x0106 #define PCI_SUBDEVICE_ID_HYPERCOPE_METRO 0x0107 #define PCI_SUBDEVICE_ID_HYPERCOPE_CHAMP2 0x0108 @@ -1220,7 +1063,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #define PCI_VENDOR_ID_KAWASAKI 0x136b #define PCI_DEVICE_ID_MCHIP_KL5A72002 0xff01 -@@ -2005,12 +1564,9 @@ +@@ -2007,12 +1647,9 @@ #define PCI_DEVICE_ID_LMC_SSI 0x0005 #define PCI_DEVICE_ID_LMC_T1 0x0006 @@ -1233,7 +1076,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #define PCI_VENDOR_ID_APPLICOM 0x1389 #define PCI_DEVICE_ID_APPLICOM_PCIGENERIC 0x0001 -@@ -2033,9 +1589,6 @@ +@@ -2035,9 +1672,6 @@ #define PCI_DEVICE_ID_MOXA_CP134U 0x1340 #define PCI_DEVICE_ID_MOXA_C168 0x1680 #define PCI_DEVICE_ID_MOXA_CP168U 0x1681 @@ -1243,7 +1086,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #define PCI_VENDOR_ID_CCD 0x1397 #define PCI_DEVICE_ID_CCD_2BD0 0x2bd0 -@@ -2056,9 +1609,7 @@ +@@ -2058,9 +1692,7 @@ #define PCI_VENDOR_ID_MICROGATE 0x13c0 #define PCI_DEVICE_ID_MICROGATE_USC 0x0010 @@ -1253,7 +1096,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #define PCI_VENDOR_ID_3WARE 0x13C1 #define PCI_DEVICE_ID_3WARE_1000 0x1000 -@@ -2109,10 +1660,6 @@ +@@ -2111,10 +1743,6 @@ #define PCI_VENDOR_ID_SAMSUNG 0x144d @@ -1264,7 +1107,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #define PCI_VENDOR_ID_TITAN 0x14D2 #define PCI_DEVICE_ID_TITAN_010L 0x8001 -@@ -2131,8 +1678,6 @@ +@@ -2133,8 +1761,6 @@ #define PCI_DEVICE_ID_PANACOM_QUADMODEM 0x0400 #define PCI_DEVICE_ID_PANACOM_DUALMODEM 0x0402 @@ -1273,7 +1116,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #define PCI_VENDOR_ID_AFAVLAB 0x14db #define PCI_DEVICE_ID_AFAVLAB_P028 0x2180 -@@ -2197,8 +1742,6 @@ +@@ -2199,8 +1825,6 @@ #define PCI_VENDOR_ID_CHELSIO 0x1425 @@ -1282,7 +1125,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #define PCI_VENDOR_ID_SYBA 0x1592 #define PCI_DEVICE_ID_SYBA_2P_EPP 0x0782 -@@ -2218,15 +1761,7 @@ +@@ -2220,15 +1844,7 @@ #define PCI_DEVICE_ID_MELLANOX_SINAI 0x6274 #define PCI_VENDOR_ID_PDC 0x15e9 @@ -1298,7 +1141,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #define PCI_VENDOR_ID_FARSITE 0x1619 #define PCI_DEVICE_ID_FARSITE_T2P 0x0400 -@@ -2244,7 +1779,6 @@ +@@ -2246,7 +1862,6 @@ #define PCI_DEVICE_ID_REVOLUTION 0x0044 #define PCI_VENDOR_ID_LINKSYS 0x1737 @@ -1306,7 +1149,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #define PCI_DEVICE_ID_LINKSYS_EG1064 0x1064 #define PCI_VENDOR_ID_ALTIMA 0x173b -@@ -2259,7 +1793,6 @@ +@@ -2261,7 +1876,6 @@ #define PCI_DEVICE_ID_HERC_WIN 0x5732 #define PCI_DEVICE_ID_HERC_UNI 0x5832 @@ -1314,7 +1157,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #define PCI_VENDOR_ID_SITECOM 0x182d #define PCI_DEVICE_ID_SITECOM_DC105V2 0x3069 -@@ -2269,8 +1802,6 @@ +@@ -2271,8 +1885,6 @@ #define PCI_VENDOR_ID_TDI 0x192E #define PCI_DEVICE_ID_TDI_EHCI 0x0101 @@ -1323,7 +1166,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #define PCI_VENDOR_ID_TEKRAM 0x1de1 #define PCI_DEVICE_ID_TEKRAM_DC290 0xdc29 -@@ -2279,59 +1810,26 @@ +@@ -2281,59 +1893,26 @@ #define PCI_DEVICE_ID_HINT_VXPROII_IDE 0x8013 #define PCI_VENDOR_ID_3DLABS 0x3d3d @@ -1383,7 +1226,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #define PCI_VENDOR_ID_DCI 0x6666 #define PCI_DEVICE_ID_DCI_PCCOM4 0x0001 -@@ -2339,7 +1837,6 @@ +@@ -2341,7 +1920,6 @@ #define PCI_VENDOR_ID_INTEL 0x8086 #define PCI_DEVICE_ID_INTEL_EESSC 0x0008 @@ -1391,7 +1234,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #define PCI_DEVICE_ID_INTEL_PXHD_0 0x0320 #define PCI_DEVICE_ID_INTEL_PXHD_1 0x0321 #define PCI_DEVICE_ID_INTEL_PXH_0 0x0329 -@@ -2348,30 +1845,17 @@ +@@ -2350,30 +1928,17 @@ #define PCI_DEVICE_ID_INTEL_82375 0x0482 #define PCI_DEVICE_ID_INTEL_82424 0x0483 #define PCI_DEVICE_ID_INTEL_82378 0x0484 @@ -1422,7 +1265,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #define PCI_DEVICE_ID_INTEL_82441 0x1237 #define PCI_DEVICE_ID_INTEL_82380FB 0x124b #define PCI_DEVICE_ID_INTEL_82439 0x1250 -@@ -2380,83 +1864,53 @@ +@@ -2382,83 +1947,53 @@ #define PCI_DEVICE_ID_INTEL_82845_HB 0x1a30 #define PCI_DEVICE_ID_INTEL_82801AA_0 0x2410 #define PCI_DEVICE_ID_INTEL_82801AA_1 0x2411 @@ -1506,7 +1349,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #define PCI_DEVICE_ID_INTEL_82820_HB 0x2500 #define PCI_DEVICE_ID_INTEL_82820_UP_HB 0x2501 #define PCI_DEVICE_ID_INTEL_82850_HB 0x2530 -@@ -2466,7 +1920,6 @@ +@@ -2468,7 +2003,6 @@ #define PCI_DEVICE_ID_INTEL_82865_HB 0x2570 #define PCI_DEVICE_ID_INTEL_82865_IG 0x2572 #define PCI_DEVICE_ID_INTEL_82875_HB 0x2578 @@ -1514,7 +1357,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #define PCI_DEVICE_ID_INTEL_82915G_HB 0x2580 #define PCI_DEVICE_ID_INTEL_82915G_IG 0x2582 #define PCI_DEVICE_ID_INTEL_82915GM_HB 0x2590 -@@ -2476,80 +1929,23 @@ +@@ -2478,80 +2012,23 @@ #define PCI_DEVICE_ID_INTEL_ICH6_0 0x2640 #define PCI_DEVICE_ID_INTEL_ICH6_1 0x2641 #define PCI_DEVICE_ID_INTEL_ICH6_2 0x2642 @@ -1595,7 +1438,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #define PCI_DEVICE_ID_INTEL_82830_HB 0x3575 #define PCI_DEVICE_ID_INTEL_82830_CGC 0x3577 #define PCI_DEVICE_ID_INTEL_82855GM_HB 0x3580 -@@ -2563,7 +1959,6 @@ +@@ -2565,7 +2042,6 @@ #define PCI_DEVICE_ID_INTEL_MCH_PC 0x3599 #define PCI_DEVICE_ID_INTEL_MCH_PC1 0x359a #define PCI_DEVICE_ID_INTEL_E7525_MCH 0x359e @@ -1603,7 +1446,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #define PCI_DEVICE_ID_INTEL_82371SB_0 0x7000 #define PCI_DEVICE_ID_INTEL_82371SB_1 0x7010 #define PCI_DEVICE_ID_INTEL_82371SB_2 0x7020 -@@ -2588,22 +1983,15 @@ +@@ -2590,22 +2066,15 @@ #define PCI_DEVICE_ID_INTEL_440MX_6 0x7196 #define PCI_DEVICE_ID_INTEL_82443MX_0 0x7198 #define PCI_DEVICE_ID_INTEL_82443MX_1 0x7199 @@ -1626,7 +1469,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #define PCI_DEVICE_ID_INTEL_IXP2800 0x9004 #define PCI_DEVICE_ID_INTEL_S21152BB 0xb152 -@@ -2616,7 +2004,6 @@ +@@ -2618,7 +2087,6 @@ #define PCI_SUBDEVICE_ID_COMPUTONE_PG6 0x0003 #define PCI_VENDOR_ID_KTI 0x8e2e @@ -1634,7 +1477,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #define PCI_VENDOR_ID_ADAPTEC 0x9004 #define PCI_DEVICE_ID_ADAPTEC_7810 0x1078 -@@ -2624,7 +2011,6 @@ +@@ -2626,7 +2094,6 @@ #define PCI_DEVICE_ID_ADAPTEC_38602 0x3860 #define PCI_DEVICE_ID_ADAPTEC_7850 0x5078 #define PCI_DEVICE_ID_ADAPTEC_7855 0x5578 @@ -1642,7 +1485,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #define PCI_DEVICE_ID_ADAPTEC_3860 0x6038 #define PCI_DEVICE_ID_ADAPTEC_1480A 0x6075 #define PCI_DEVICE_ID_ADAPTEC_7860 0x6078 -@@ -2644,7 +2030,6 @@ +@@ -2646,7 +2113,6 @@ #define PCI_DEVICE_ID_ADAPTEC_7886 0x8678 #define PCI_DEVICE_ID_ADAPTEC_7887 0x8778 #define PCI_DEVICE_ID_ADAPTEC_7888 0x8878 @@ -1650,7 +1493,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #define PCI_VENDOR_ID_ADAPTEC2 0x9005 #define PCI_DEVICE_ID_ADAPTEC2_2940U2 0x0010 -@@ -2664,8 +2049,6 @@ +@@ -2666,8 +2132,6 @@ #define PCI_DEVICE_ID_ADAPTEC2_7899P 0x00cf #define PCI_DEVICE_ID_ADAPTEC2_SCAMP 0x0503 @@ -1659,7 +1502,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #define PCI_VENDOR_ID_HOLTEK 0x9412 #define PCI_DEVICE_ID_HOLTEK_6565 0x6565 -@@ -2697,7 +2080,3 @@ +@@ -2699,7 +2163,3 @@ #define PCI_DEVICE_ID_RME_DIGI32_PRO 0x9897 #define PCI_DEVICE_ID_RME_DIGI32_8 0x9898 |