[PATCHv3 04a/04] pci_ids: whitespace cleanup, resend first half

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



From: Grant Coady <[email protected]>

pci_ids.h: whitespace cleanup, split into two 'cos lkml ate single patch.

Signed-off-by: Grant Coady <[email protected]>

---
 pci_ids.h | 1870 ++++++++++++++++++++++++++++++--------------------------------
 1 files changed, 926 insertions(+), 944 deletions(-)

--- linux-2.6.14-rc2-git7b/include/linux/pci_ids.h	2005-09-29 15:34:57.000000000 +1000
+++ linux-2.6.14-rc2-git7c/include/linux/pci_ids.h	2005-09-29 15:49:19.000000000 +1000
@@ -2,127 +2,129 @@
  *	PCI Class, Vendor and Device IDs
  *
  *	Please keep sorted.
+ *
+ *	September 2005 - cleanup by Grant Coady <[email protected]>
  */
 
 /* Device classes and subclasses */
 
-#define PCI_CLASS_NOT_DEFINED		0x0000
-#define PCI_CLASS_NOT_DEFINED_VGA	0x0001
+#define PCI_CLASS_NOT_DEFINED			0x0000
+#define PCI_CLASS_NOT_DEFINED_VGA		0x0001
 
-#define PCI_BASE_CLASS_STORAGE		0x01
-#define PCI_CLASS_STORAGE_SCSI		0x0100
-#define PCI_CLASS_STORAGE_IDE		0x0101
-#define PCI_CLASS_STORAGE_FLOPPY	0x0102
-#define PCI_CLASS_STORAGE_IPI		0x0103
-#define PCI_CLASS_STORAGE_RAID		0x0104
-#define PCI_CLASS_STORAGE_OTHER		0x0180
-
-#define PCI_BASE_CLASS_NETWORK		0x02
-#define PCI_CLASS_NETWORK_ETHERNET	0x0200
-#define PCI_CLASS_NETWORK_TOKEN_RING	0x0201
-#define PCI_CLASS_NETWORK_FDDI		0x0202
-#define PCI_CLASS_NETWORK_ATM		0x0203
-#define PCI_CLASS_NETWORK_OTHER		0x0280
-
-#define PCI_BASE_CLASS_DISPLAY		0x03
-#define PCI_CLASS_DISPLAY_VGA		0x0300
-#define PCI_CLASS_DISPLAY_XGA		0x0301
-#define PCI_CLASS_DISPLAY_3D		0x0302
-#define PCI_CLASS_DISPLAY_OTHER		0x0380
-
-#define PCI_BASE_CLASS_MULTIMEDIA	0x04
-#define PCI_CLASS_MULTIMEDIA_VIDEO	0x0400
-#define PCI_CLASS_MULTIMEDIA_AUDIO	0x0401
-#define PCI_CLASS_MULTIMEDIA_PHONE	0x0402
-#define PCI_CLASS_MULTIMEDIA_OTHER	0x0480
-
-#define PCI_BASE_CLASS_MEMORY		0x05
-#define PCI_CLASS_MEMORY_RAM		0x0500
-#define PCI_CLASS_MEMORY_FLASH		0x0501
-#define PCI_CLASS_MEMORY_OTHER		0x0580
-
-#define PCI_BASE_CLASS_BRIDGE		0x06
-#define PCI_CLASS_BRIDGE_HOST		0x0600
-#define PCI_CLASS_BRIDGE_ISA		0x0601
-#define PCI_CLASS_BRIDGE_EISA		0x0602
-#define PCI_CLASS_BRIDGE_MC		0x0603
-#define PCI_CLASS_BRIDGE_PCI		0x0604
-#define PCI_CLASS_BRIDGE_PCMCIA		0x0605
-#define PCI_CLASS_BRIDGE_NUBUS		0x0606
-#define PCI_CLASS_BRIDGE_CARDBUS	0x0607
-#define PCI_CLASS_BRIDGE_RACEWAY	0x0608
-#define PCI_CLASS_BRIDGE_OTHER		0x0680
-
-#define PCI_BASE_CLASS_COMMUNICATION	0x07
-#define PCI_CLASS_COMMUNICATION_SERIAL	0x0700
-#define PCI_CLASS_COMMUNICATION_PARALLEL 0x0701
-#define PCI_CLASS_COMMUNICATION_MULTISERIAL 0x0702
-#define PCI_CLASS_COMMUNICATION_MODEM	0x0703
-#define PCI_CLASS_COMMUNICATION_OTHER	0x0780
-
-#define PCI_BASE_CLASS_SYSTEM		0x08
-#define PCI_CLASS_SYSTEM_PIC		0x0800
-#define PCI_CLASS_SYSTEM_PIC_IOAPIC	0x080010
-#define PCI_CLASS_SYSTEM_PIC_IOXAPIC	0x080020
-#define PCI_CLASS_SYSTEM_DMA		0x0801
-#define PCI_CLASS_SYSTEM_TIMER		0x0802
-#define PCI_CLASS_SYSTEM_RTC		0x0803
-#define PCI_CLASS_SYSTEM_PCI_HOTPLUG	0x0804
-#define PCI_CLASS_SYSTEM_OTHER		0x0880
-
-#define PCI_BASE_CLASS_INPUT		0x09
-#define PCI_CLASS_INPUT_KEYBOARD	0x0900
-#define PCI_CLASS_INPUT_PEN		0x0901
-#define PCI_CLASS_INPUT_MOUSE		0x0902
-#define PCI_CLASS_INPUT_SCANNER		0x0903
-#define PCI_CLASS_INPUT_GAMEPORT	0x0904
-#define PCI_CLASS_INPUT_OTHER		0x0980
-
-#define PCI_BASE_CLASS_DOCKING		0x0a
-#define PCI_CLASS_DOCKING_GENERIC	0x0a00
-#define PCI_CLASS_DOCKING_OTHER		0x0a80
-
-#define PCI_BASE_CLASS_PROCESSOR	0x0b
-#define PCI_CLASS_PROCESSOR_386		0x0b00
-#define PCI_CLASS_PROCESSOR_486		0x0b01
-#define PCI_CLASS_PROCESSOR_PENTIUM	0x0b02
-#define PCI_CLASS_PROCESSOR_ALPHA	0x0b10
-#define PCI_CLASS_PROCESSOR_POWERPC	0x0b20
-#define PCI_CLASS_PROCESSOR_MIPS	0x0b30
-#define PCI_CLASS_PROCESSOR_CO		0x0b40
-
-#define PCI_BASE_CLASS_SERIAL		0x0c
-#define PCI_CLASS_SERIAL_FIREWIRE	0x0c00
-#define PCI_CLASS_SERIAL_ACCESS		0x0c01
-#define PCI_CLASS_SERIAL_SSA		0x0c02
-#define PCI_CLASS_SERIAL_USB		0x0c03
-#define PCI_CLASS_SERIAL_FIBER		0x0c04
-#define PCI_CLASS_SERIAL_SMBUS		0x0c05
-
-#define PCI_BASE_CLASS_INTELLIGENT	0x0e
-#define PCI_CLASS_INTELLIGENT_I2O	0x0e00
-
-#define PCI_BASE_CLASS_SATELLITE	0x0f
-#define PCI_CLASS_SATELLITE_TV		0x0f00
-#define PCI_CLASS_SATELLITE_AUDIO	0x0f01
-#define PCI_CLASS_SATELLITE_VOICE	0x0f03
-#define PCI_CLASS_SATELLITE_DATA	0x0f04
-
-#define PCI_BASE_CLASS_CRYPT		0x10
-#define PCI_CLASS_CRYPT_NETWORK		0x1000
-#define PCI_CLASS_CRYPT_ENTERTAINMENT	0x1001
-#define PCI_CLASS_CRYPT_OTHER		0x1080
-
-#define PCI_BASE_CLASS_SIGNAL_PROCESSING 0x11
-#define PCI_CLASS_SP_DPIO		0x1100
-#define PCI_CLASS_SP_OTHER		0x1180
+#define PCI_BASE_CLASS_STORAGE			0x01
+#define PCI_CLASS_STORAGE_SCSI			0x0100
+#define PCI_CLASS_STORAGE_IDE			0x0101
+#define PCI_CLASS_STORAGE_FLOPPY		0x0102
+#define PCI_CLASS_STORAGE_IPI			0x0103
+#define PCI_CLASS_STORAGE_RAID			0x0104
+#define PCI_CLASS_STORAGE_OTHER			0x0180
+
+#define PCI_BASE_CLASS_NETWORK			0x02
+#define PCI_CLASS_NETWORK_ETHERNET		0x0200
+#define PCI_CLASS_NETWORK_TOKEN_RING		0x0201
+#define PCI_CLASS_NETWORK_FDDI			0x0202
+#define PCI_CLASS_NETWORK_ATM			0x0203
+#define PCI_CLASS_NETWORK_OTHER			0x0280
+
+#define PCI_BASE_CLASS_DISPLAY			0x03
+#define PCI_CLASS_DISPLAY_VGA			0x0300
+#define PCI_CLASS_DISPLAY_XGA			0x0301
+#define PCI_CLASS_DISPLAY_3D			0x0302
+#define PCI_CLASS_DISPLAY_OTHER			0x0380
+
+#define PCI_BASE_CLASS_MULTIMEDIA		0x04
+#define PCI_CLASS_MULTIMEDIA_VIDEO		0x0400
+#define PCI_CLASS_MULTIMEDIA_AUDIO		0x0401
+#define PCI_CLASS_MULTIMEDIA_PHONE		0x0402
+#define PCI_CLASS_MULTIMEDIA_OTHER		0x0480
+
+#define PCI_BASE_CLASS_MEMORY			0x05
+#define PCI_CLASS_MEMORY_RAM			0x0500
+#define PCI_CLASS_MEMORY_FLASH			0x0501
+#define PCI_CLASS_MEMORY_OTHER			0x0580
+
+#define PCI_BASE_CLASS_BRIDGE			0x06
+#define PCI_CLASS_BRIDGE_HOST			0x0600
+#define PCI_CLASS_BRIDGE_ISA			0x0601
+#define PCI_CLASS_BRIDGE_EISA			0x0602
+#define PCI_CLASS_BRIDGE_MC			0x0603
+#define PCI_CLASS_BRIDGE_PCI			0x0604
+#define PCI_CLASS_BRIDGE_PCMCIA			0x0605
+#define PCI_CLASS_BRIDGE_NUBUS			0x0606
+#define PCI_CLASS_BRIDGE_CARDBUS		0x0607
+#define PCI_CLASS_BRIDGE_RACEWAY		0x0608
+#define PCI_CLASS_BRIDGE_OTHER			0x0680
+
+#define PCI_BASE_CLASS_COMMUNICATION		0x07
+#define PCI_CLASS_COMMUNICATION_SERIAL		0x0700
+#define PCI_CLASS_COMMUNICATION_PARALLEL	0x0701
+#define PCI_CLASS_COMMUNICATION_MULTISERIAL	0x0702
+#define PCI_CLASS_COMMUNICATION_MODEM		0x0703
+#define PCI_CLASS_COMMUNICATION_OTHER		0x0780
+
+#define PCI_BASE_CLASS_SYSTEM			0x08
+#define PCI_CLASS_SYSTEM_PIC			0x0800
+#define PCI_CLASS_SYSTEM_PIC_IOAPIC		0x080010
+#define PCI_CLASS_SYSTEM_PIC_IOXAPIC		0x080020
+#define PCI_CLASS_SYSTEM_DMA			0x0801
+#define PCI_CLASS_SYSTEM_TIMER			0x0802
+#define PCI_CLASS_SYSTEM_RTC			0x0803
+#define PCI_CLASS_SYSTEM_PCI_HOTPLUG		0x0804
+#define PCI_CLASS_SYSTEM_OTHER			0x0880
+
+#define PCI_BASE_CLASS_INPUT			0x09
+#define PCI_CLASS_INPUT_KEYBOARD		0x0900
+#define PCI_CLASS_INPUT_PEN			0x0901
+#define PCI_CLASS_INPUT_MOUSE			0x0902
+#define PCI_CLASS_INPUT_SCANNER			0x0903
+#define PCI_CLASS_INPUT_GAMEPORT		0x0904
+#define PCI_CLASS_INPUT_OTHER			0x0980
+
+#define PCI_BASE_CLASS_DOCKING			0x0a
+#define PCI_CLASS_DOCKING_GENERIC		0x0a00
+#define PCI_CLASS_DOCKING_OTHER			0x0a80
+
+#define PCI_BASE_CLASS_PROCESSOR		0x0b
+#define PCI_CLASS_PROCESSOR_386			0x0b00
+#define PCI_CLASS_PROCESSOR_486			0x0b01
+#define PCI_CLASS_PROCESSOR_PENTIUM		0x0b02
+#define PCI_CLASS_PROCESSOR_ALPHA		0x0b10
+#define PCI_CLASS_PROCESSOR_POWERPC		0x0b20
+#define PCI_CLASS_PROCESSOR_MIPS		0x0b30
+#define PCI_CLASS_PROCESSOR_CO			0x0b40
+
+#define PCI_BASE_CLASS_SERIAL			0x0c
+#define PCI_CLASS_SERIAL_FIREWIRE		0x0c00
+#define PCI_CLASS_SERIAL_ACCESS			0x0c01
+#define PCI_CLASS_SERIAL_SSA			0x0c02
+#define PCI_CLASS_SERIAL_USB			0x0c03
+#define PCI_CLASS_SERIAL_FIBER			0x0c04
+#define PCI_CLASS_SERIAL_SMBUS			0x0c05
+
+#define PCI_BASE_CLASS_INTELLIGENT		0x0e
+#define PCI_CLASS_INTELLIGENT_I2O		0x0e00
+
+#define PCI_BASE_CLASS_SATELLITE		0x0f
+#define PCI_CLASS_SATELLITE_TV			0x0f00
+#define PCI_CLASS_SATELLITE_AUDIO		0x0f01
+#define PCI_CLASS_SATELLITE_VOICE		0x0f03
+#define PCI_CLASS_SATELLITE_DATA		0x0f04
+
+#define PCI_BASE_CLASS_CRYPT			0x10
+#define PCI_CLASS_CRYPT_NETWORK			0x1000
+#define PCI_CLASS_CRYPT_ENTERTAINMENT		0x1001
+#define PCI_CLASS_CRYPT_OTHER			0x1080
+
+#define PCI_BASE_CLASS_SIGNAL_PROCESSING	0x11
+#define PCI_CLASS_SP_DPIO			0x1100
+#define PCI_CLASS_SP_OTHER			0x1180
 
-#define PCI_CLASS_OTHERS		0xff
+#define PCI_CLASS_OTHERS			0xff
 
 /* Vendors and devices.  Sort key: vendor first, device next. */
 
-#define PCI_VENDOR_ID_DYNALINK		0x0675
-#define PCI_DEVICE_ID_DYNALINK_IS64PH	0x1702
+#define PCI_VENDOR_ID_DYNALINK			0x0675
+#define PCI_DEVICE_ID_DYNALINK_IS64PH		0x1702
 
 #define PCI_VENDOR_ID_BERKOM			0x0871
 #define PCI_DEVICE_ID_BERKOM_A1T		0xffa1
@@ -130,878 +132,858 @@
 #define PCI_DEVICE_ID_BERKOM_A4T		0xffa4
 #define PCI_DEVICE_ID_BERKOM_SCITEL_QUADRO	0xffa8
 
-#define PCI_VENDOR_ID_COMPAQ		0x0e11
-#define PCI_DEVICE_ID_COMPAQ_TOKENRING	0x0508
-#define PCI_DEVICE_ID_COMPAQ_TACHYON	0xa0fc
-#define PCI_DEVICE_ID_COMPAQ_SMART2P	0xae10
-#define PCI_DEVICE_ID_COMPAQ_NETEL100	0xae32
-#define PCI_DEVICE_ID_COMPAQ_NETEL10	0xae34
-#define PCI_DEVICE_ID_COMPAQ_TRIFLEX_IDE 0xae33
-#define PCI_DEVICE_ID_COMPAQ_NETFLEX3I	0xae35
-#define PCI_DEVICE_ID_COMPAQ_NETEL100D	0xae40
-#define PCI_DEVICE_ID_COMPAQ_NETEL100PI	0xae43
-#define PCI_DEVICE_ID_COMPAQ_NETEL100I	0xb011
-#define PCI_DEVICE_ID_COMPAQ_CISS	0xb060
-#define PCI_DEVICE_ID_COMPAQ_CISSB	0xb178
-#define PCI_DEVICE_ID_COMPAQ_CISSC	0x46
-#define PCI_DEVICE_ID_COMPAQ_THUNDER	0xf130
-#define PCI_DEVICE_ID_COMPAQ_NETFLEX3B	0xf150
-
-#define PCI_VENDOR_ID_NCR		0x1000
-#define PCI_VENDOR_ID_LSI_LOGIC		0x1000
-#define PCI_DEVICE_ID_NCR_53C810	0x0001
-#define PCI_DEVICE_ID_NCR_53C820	0x0002
-#define PCI_DEVICE_ID_NCR_53C825	0x0003
-#define PCI_DEVICE_ID_NCR_53C815	0x0004
-#define PCI_DEVICE_ID_LSI_53C810AP	0x0005
-#define PCI_DEVICE_ID_NCR_53C860	0x0006
-#define PCI_DEVICE_ID_LSI_53C1510	0x000a
-#define PCI_DEVICE_ID_NCR_53C896	0x000b
-#define PCI_DEVICE_ID_NCR_53C895	0x000c
-#define PCI_DEVICE_ID_NCR_53C885	0x000d
-#define PCI_DEVICE_ID_NCR_53C875	0x000f
-#define PCI_DEVICE_ID_NCR_53C1510	0x0010
-#define PCI_DEVICE_ID_LSI_53C895A	0x0012
-#define PCI_DEVICE_ID_LSI_53C875A	0x0013
-#define PCI_DEVICE_ID_LSI_53C1010_33	0x0020
-#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_NCR_53C875J	0x008f
-#define PCI_DEVICE_ID_LSI_FC909		0x0621
-#define PCI_DEVICE_ID_LSI_FC929		0x0622
-#define PCI_DEVICE_ID_LSI_FC919		0x0624
-#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_LSI_SAS1064	0x0050
-#define PCI_DEVICE_ID_LSI_SAS1066	0x005E
-#define PCI_DEVICE_ID_LSI_SAS1068	0x0054
-#define PCI_DEVICE_ID_LSI_SAS1064E	0x0056
-#define PCI_DEVICE_ID_LSI_SAS1066E	0x005A
-#define PCI_DEVICE_ID_LSI_SAS1068E	0x0058
+#define PCI_VENDOR_ID_COMPAQ			0x0e11
+#define PCI_DEVICE_ID_COMPAQ_TOKENRING		0x0508
+#define PCI_DEVICE_ID_COMPAQ_TACHYON		0xa0fc
+#define PCI_DEVICE_ID_COMPAQ_SMART2P		0xae10
+#define PCI_DEVICE_ID_COMPAQ_NETEL100		0xae32
+#define PCI_DEVICE_ID_COMPAQ_NETEL10		0xae34
+#define PCI_DEVICE_ID_COMPAQ_TRIFLEX_IDE	0xae33
+#define PCI_DEVICE_ID_COMPAQ_NETFLEX3I		0xae35
+#define PCI_DEVICE_ID_COMPAQ_NETEL100D		0xae40
+#define PCI_DEVICE_ID_COMPAQ_NETEL100PI		0xae43
+#define PCI_DEVICE_ID_COMPAQ_NETEL100I		0xb011
+#define PCI_DEVICE_ID_COMPAQ_CISS		0xb060
+#define PCI_DEVICE_ID_COMPAQ_CISSB		0xb178
+#define PCI_DEVICE_ID_COMPAQ_CISSC		0x46
+#define PCI_DEVICE_ID_COMPAQ_THUNDER		0xf130
+#define PCI_DEVICE_ID_COMPAQ_NETFLEX3B		0xf150
+
+#define PCI_VENDOR_ID_NCR			0x1000
+#define PCI_VENDOR_ID_LSI_LOGIC			0x1000
+#define PCI_DEVICE_ID_NCR_53C810		0x0001
+#define PCI_DEVICE_ID_NCR_53C820		0x0002
+#define PCI_DEVICE_ID_NCR_53C825		0x0003
+#define PCI_DEVICE_ID_NCR_53C815		0x0004
+#define PCI_DEVICE_ID_LSI_53C810AP		0x0005
+#define PCI_DEVICE_ID_NCR_53C860		0x0006
+#define PCI_DEVICE_ID_LSI_53C1510		0x000a
+#define PCI_DEVICE_ID_NCR_53C896		0x000b
+#define PCI_DEVICE_ID_NCR_53C895		0x000c
+#define PCI_DEVICE_ID_NCR_53C885		0x000d
+#define PCI_DEVICE_ID_NCR_53C875		0x000f
+#define PCI_DEVICE_ID_NCR_53C1510		0x0010
+#define PCI_DEVICE_ID_LSI_53C895A		0x0012
+#define PCI_DEVICE_ID_LSI_53C875A		0x0013
+#define PCI_DEVICE_ID_LSI_53C1010_33		0x0020
+#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_NCR_53C875J		0x008f
+#define PCI_DEVICE_ID_LSI_FC909			0x0621
+#define PCI_DEVICE_ID_LSI_FC929			0x0622
+#define PCI_DEVICE_ID_LSI_FC919			0x0624
+#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_LSI_SAS1064		0x0050
+#define PCI_DEVICE_ID_LSI_SAS1066		0x005E
+#define PCI_DEVICE_ID_LSI_SAS1068		0x0054
+#define PCI_DEVICE_ID_LSI_SAS1064E		0x0056
+#define PCI_DEVICE_ID_LSI_SAS1066E		0x005A
+#define PCI_DEVICE_ID_LSI_SAS1068E		0x0058
 
-#define PCI_VENDOR_ID_ATI		0x1002
+#define PCI_VENDOR_ID_ATI			0x1002
 /* Mach64 */
 /* Mach64 / Rage */
 /* Mach64 VT */
 /* Rage128 GL */
-#define PCI_DEVICE_ID_ATI_RAGE128_RE	0x5245
-#define PCI_DEVICE_ID_ATI_RAGE128_RF	0x5246
-#define PCI_DEVICE_ID_ATI_RAGE128_RG	0x5247
+#define PCI_DEVICE_ID_ATI_RAGE128_RE		0x5245
+#define PCI_DEVICE_ID_ATI_RAGE128_RF		0x5246
+#define PCI_DEVICE_ID_ATI_RAGE128_RG		0x5247
 /* Rage128 VR */
-#define PCI_DEVICE_ID_ATI_RAGE128_RK	0x524b
-#define PCI_DEVICE_ID_ATI_RAGE128_RL	0x524c
-#define PCI_DEVICE_ID_ATI_RAGE128_SE	0x5345
-#define PCI_DEVICE_ID_ATI_RAGE128_SF	0x5346
-#define PCI_DEVICE_ID_ATI_RAGE128_SG	0x5347
-#define PCI_DEVICE_ID_ATI_RAGE128_SH	0x5348
-#define PCI_DEVICE_ID_ATI_RAGE128_SK	0x534b
-#define PCI_DEVICE_ID_ATI_RAGE128_SL	0x534c
-#define PCI_DEVICE_ID_ATI_RAGE128_SM	0x534d
-#define PCI_DEVICE_ID_ATI_RAGE128_SN	0x534e
+#define PCI_DEVICE_ID_ATI_RAGE128_RK		0x524b
+#define PCI_DEVICE_ID_ATI_RAGE128_RL		0x524c
+#define PCI_DEVICE_ID_ATI_RAGE128_SE		0x5345
+#define PCI_DEVICE_ID_ATI_RAGE128_SF		0x5346
+#define PCI_DEVICE_ID_ATI_RAGE128_SG		0x5347
+#define PCI_DEVICE_ID_ATI_RAGE128_SH		0x5348
+#define PCI_DEVICE_ID_ATI_RAGE128_SK		0x534b
+#define PCI_DEVICE_ID_ATI_RAGE128_SL		0x534c
+#define PCI_DEVICE_ID_ATI_RAGE128_SM		0x534d
+#define PCI_DEVICE_ID_ATI_RAGE128_SN		0x534e
 /* Rage128 Ultra */
-#define PCI_DEVICE_ID_ATI_RAGE128_TF	0x5446
-#define PCI_DEVICE_ID_ATI_RAGE128_TL	0x544c
-#define PCI_DEVICE_ID_ATI_RAGE128_TR	0x5452
-#define PCI_DEVICE_ID_ATI_RAGE128_TS	0x5453
-#define PCI_DEVICE_ID_ATI_RAGE128_TT	0x5454
-#define PCI_DEVICE_ID_ATI_RAGE128_TU	0x5455
+#define PCI_DEVICE_ID_ATI_RAGE128_TF		0x5446
+#define PCI_DEVICE_ID_ATI_RAGE128_TL		0x544c
+#define PCI_DEVICE_ID_ATI_RAGE128_TR		0x5452
+#define PCI_DEVICE_ID_ATI_RAGE128_TS		0x5453
+#define PCI_DEVICE_ID_ATI_RAGE128_TT		0x5454
+#define PCI_DEVICE_ID_ATI_RAGE128_TU		0x5455
 /* Rage128 M3 */
-#define PCI_DEVICE_ID_ATI_RAGE128_LE	0x4c45
-#define PCI_DEVICE_ID_ATI_RAGE128_LF	0x4c46
+#define PCI_DEVICE_ID_ATI_RAGE128_LE		0x4c45
+#define PCI_DEVICE_ID_ATI_RAGE128_LF		0x4c46
 /* Rage128 M4 */
-#define PCI_DEVICE_ID_ATI_RAGE128_MF    0x4d46
-#define PCI_DEVICE_ID_ATI_RAGE128_ML    0x4d4c
+#define PCI_DEVICE_ID_ATI_RAGE128_MF		0x4d46
+#define PCI_DEVICE_ID_ATI_RAGE128_ML		0x4d4c
 /* Rage128 Pro GL */
-#define PCI_DEVICE_ID_ATI_RAGE128_PA	0x5041
-#define PCI_DEVICE_ID_ATI_RAGE128_PB	0x5042
-#define PCI_DEVICE_ID_ATI_RAGE128_PC	0x5043
-#define PCI_DEVICE_ID_ATI_RAGE128_PD	0x5044
-#define PCI_DEVICE_ID_ATI_RAGE128_PE	0x5045
-#define PCI_DEVICE_ID_ATI_RAGE128_PF	0x5046
+#define PCI_DEVICE_ID_ATI_RAGE128_PA		0x5041
+#define PCI_DEVICE_ID_ATI_RAGE128_PB		0x5042
+#define PCI_DEVICE_ID_ATI_RAGE128_PC		0x5043
+#define PCI_DEVICE_ID_ATI_RAGE128_PD		0x5044
+#define PCI_DEVICE_ID_ATI_RAGE128_PE		0x5045
+#define PCI_DEVICE_ID_ATI_RAGE128_PF		0x5046
 /* Rage128 Pro VR */
-#define PCI_DEVICE_ID_ATI_RAGE128_PG	0x5047
-#define PCI_DEVICE_ID_ATI_RAGE128_PH	0x5048
-#define PCI_DEVICE_ID_ATI_RAGE128_PI	0x5049
-#define PCI_DEVICE_ID_ATI_RAGE128_PJ	0x504A
-#define PCI_DEVICE_ID_ATI_RAGE128_PK	0x504B
-#define PCI_DEVICE_ID_ATI_RAGE128_PL	0x504C
-#define PCI_DEVICE_ID_ATI_RAGE128_PM	0x504D
-#define PCI_DEVICE_ID_ATI_RAGE128_PN	0x504E
-#define PCI_DEVICE_ID_ATI_RAGE128_PO	0x504F
-#define PCI_DEVICE_ID_ATI_RAGE128_PP	0x5050
-#define PCI_DEVICE_ID_ATI_RAGE128_PQ	0x5051
-#define PCI_DEVICE_ID_ATI_RAGE128_PR	0x5052
-#define PCI_DEVICE_ID_ATI_RAGE128_PS	0x5053
-#define PCI_DEVICE_ID_ATI_RAGE128_PT	0x5054
-#define PCI_DEVICE_ID_ATI_RAGE128_PU	0x5055
-#define PCI_DEVICE_ID_ATI_RAGE128_PV	0x5056
-#define PCI_DEVICE_ID_ATI_RAGE128_PW	0x5057
-#define PCI_DEVICE_ID_ATI_RAGE128_PX	0x5058
+#define PCI_DEVICE_ID_ATI_RAGE128_PG		0x5047
+#define PCI_DEVICE_ID_ATI_RAGE128_PH		0x5048
+#define PCI_DEVICE_ID_ATI_RAGE128_PI		0x5049
+#define PCI_DEVICE_ID_ATI_RAGE128_PJ		0x504A
+#define PCI_DEVICE_ID_ATI_RAGE128_PK		0x504B
+#define PCI_DEVICE_ID_ATI_RAGE128_PL		0x504C
+#define PCI_DEVICE_ID_ATI_RAGE128_PM		0x504D
+#define PCI_DEVICE_ID_ATI_RAGE128_PN		0x504E
+#define PCI_DEVICE_ID_ATI_RAGE128_PO		0x504F
+#define PCI_DEVICE_ID_ATI_RAGE128_PP		0x5050
+#define PCI_DEVICE_ID_ATI_RAGE128_PQ		0x5051
+#define PCI_DEVICE_ID_ATI_RAGE128_PR		0x5052
+#define PCI_DEVICE_ID_ATI_RAGE128_PS		0x5053
+#define PCI_DEVICE_ID_ATI_RAGE128_PT		0x5054
+#define PCI_DEVICE_ID_ATI_RAGE128_PU		0x5055
+#define PCI_DEVICE_ID_ATI_RAGE128_PV		0x5056
+#define PCI_DEVICE_ID_ATI_RAGE128_PW		0x5057
+#define PCI_DEVICE_ID_ATI_RAGE128_PX		0x5058
 /* Rage128 M4 */
 /* Radeon R100 */
-#define PCI_DEVICE_ID_ATI_RADEON_QD	0x5144
-#define PCI_DEVICE_ID_ATI_RADEON_QE	0x5145
-#define PCI_DEVICE_ID_ATI_RADEON_QF	0x5146
-#define PCI_DEVICE_ID_ATI_RADEON_QG	0x5147
+#define PCI_DEVICE_ID_ATI_RADEON_QD		0x5144
+#define PCI_DEVICE_ID_ATI_RADEON_QE		0x5145
+#define PCI_DEVICE_ID_ATI_RADEON_QF		0x5146
+#define PCI_DEVICE_ID_ATI_RADEON_QG		0x5147
 /* Radeon RV100 (VE) */
-#define PCI_DEVICE_ID_ATI_RADEON_QY	0x5159
-#define PCI_DEVICE_ID_ATI_RADEON_QZ	0x515a
+#define PCI_DEVICE_ID_ATI_RADEON_QY		0x5159
+#define PCI_DEVICE_ID_ATI_RADEON_QZ		0x515a
 /* Radeon R200 (8500) */
-#define PCI_DEVICE_ID_ATI_RADEON_QL	0x514c
-#define PCI_DEVICE_ID_ATI_RADEON_QN	0x514e
-#define PCI_DEVICE_ID_ATI_RADEON_QO	0x514f
-#define PCI_DEVICE_ID_ATI_RADEON_Ql	0x516c
-#define PCI_DEVICE_ID_ATI_RADEON_BB	0x4242
+#define PCI_DEVICE_ID_ATI_RADEON_QL		0x514c
+#define PCI_DEVICE_ID_ATI_RADEON_QN		0x514e
+#define PCI_DEVICE_ID_ATI_RADEON_QO		0x514f
+#define PCI_DEVICE_ID_ATI_RADEON_Ql		0x516c
+#define PCI_DEVICE_ID_ATI_RADEON_BB		0x4242
 /* Radeon R200 (9100) */
-#define PCI_DEVICE_ID_ATI_RADEON_QM	0x514d
+#define PCI_DEVICE_ID_ATI_RADEON_QM		0x514d
 /* Radeon RV200 (7500) */
-#define PCI_DEVICE_ID_ATI_RADEON_QW	0x5157
-#define PCI_DEVICE_ID_ATI_RADEON_QX	0x5158
+#define PCI_DEVICE_ID_ATI_RADEON_QW		0x5157
+#define PCI_DEVICE_ID_ATI_RADEON_QX		0x5158
 /* Radeon NV-100 */
 /* Radeon RV250 (9000) */
-#define PCI_DEVICE_ID_ATI_RADEON_Id	0x4964
-#define PCI_DEVICE_ID_ATI_RADEON_Ie	0x4965
-#define PCI_DEVICE_ID_ATI_RADEON_If	0x4966
-#define PCI_DEVICE_ID_ATI_RADEON_Ig	0x4967
+#define PCI_DEVICE_ID_ATI_RADEON_Id		0x4964
+#define PCI_DEVICE_ID_ATI_RADEON_Ie		0x4965
+#define PCI_DEVICE_ID_ATI_RADEON_If		0x4966
+#define PCI_DEVICE_ID_ATI_RADEON_Ig		0x4967
 /* Radeon RV280 (9200) */
-#define PCI_DEVICE_ID_ATI_RADEON_Ya	0x5961
-#define PCI_DEVICE_ID_ATI_RADEON_Yd	0x5964
+#define PCI_DEVICE_ID_ATI_RADEON_Ya		0x5961
+#define PCI_DEVICE_ID_ATI_RADEON_Yd		0x5964
 /* Radeon R300 (9500) */
 /* Radeon R300 (9700) */
-#define PCI_DEVICE_ID_ATI_RADEON_ND	0x4e44
-#define PCI_DEVICE_ID_ATI_RADEON_NE	0x4e45
-#define PCI_DEVICE_ID_ATI_RADEON_NF	0x4e46
-#define PCI_DEVICE_ID_ATI_RADEON_NG	0x4e47
+#define PCI_DEVICE_ID_ATI_RADEON_ND		0x4e44
+#define PCI_DEVICE_ID_ATI_RADEON_NE		0x4e45
+#define PCI_DEVICE_ID_ATI_RADEON_NF		0x4e46
+#define PCI_DEVICE_ID_ATI_RADEON_NG		0x4e47
 /* Radeon R350 (9800) */
 /* Radeon RV350 (9600) */
 /* Radeon M6 */
-#define PCI_DEVICE_ID_ATI_RADEON_LY	0x4c59
-#define PCI_DEVICE_ID_ATI_RADEON_LZ	0x4c5a
+#define PCI_DEVICE_ID_ATI_RADEON_LY		0x4c59
+#define PCI_DEVICE_ID_ATI_RADEON_LZ		0x4c5a
 /* Radeon M7 */
-#define PCI_DEVICE_ID_ATI_RADEON_LW	0x4c57
-#define PCI_DEVICE_ID_ATI_RADEON_LX	0x4c58
+#define PCI_DEVICE_ID_ATI_RADEON_LW		0x4c57
+#define PCI_DEVICE_ID_ATI_RADEON_LX		0x4c58
 /* Radeon M9 */
-#define PCI_DEVICE_ID_ATI_RADEON_Ld	0x4c64
-#define PCI_DEVICE_ID_ATI_RADEON_Le	0x4c65
-#define PCI_DEVICE_ID_ATI_RADEON_Lf	0x4c66
-#define PCI_DEVICE_ID_ATI_RADEON_Lg	0x4c67
+#define PCI_DEVICE_ID_ATI_RADEON_Ld		0x4c64
+#define PCI_DEVICE_ID_ATI_RADEON_Le		0x4c65
+#define PCI_DEVICE_ID_ATI_RADEON_Lf		0x4c66
+#define PCI_DEVICE_ID_ATI_RADEON_Lg		0x4c67
 /* Radeon */
 /* RadeonIGP */
-#define PCI_DEVICE_ID_ATI_RS100		0xcab0
-#define PCI_DEVICE_ID_ATI_RS200		0xcab2
-#define PCI_DEVICE_ID_ATI_RS200_B	0xcbb2
-#define PCI_DEVICE_ID_ATI_RS250		0xcab3
-#define PCI_DEVICE_ID_ATI_RS300_100	0x5830
-#define PCI_DEVICE_ID_ATI_RS300_133	0x5831
-#define PCI_DEVICE_ID_ATI_RS300_166	0x5832
-#define PCI_DEVICE_ID_ATI_RS300_200	0x5833
+#define PCI_DEVICE_ID_ATI_RS100			0xcab0
+#define PCI_DEVICE_ID_ATI_RS200			0xcab2
+#define PCI_DEVICE_ID_ATI_RS200_B		0xcbb2
+#define PCI_DEVICE_ID_ATI_RS250			0xcab3
+#define PCI_DEVICE_ID_ATI_RS300_100		0x5830
+#define PCI_DEVICE_ID_ATI_RS300_133		0x5831
+#define PCI_DEVICE_ID_ATI_RS300_166		0x5832
+#define PCI_DEVICE_ID_ATI_RS300_200		0x5833
 /* ATI IXP Chipset */
-#define PCI_DEVICE_ID_ATI_IXP200_IDE	0x4349
-#define PCI_DEVICE_ID_ATI_IXP300_IDE	0x4369
-#define PCI_DEVICE_ID_ATI_IXP400_IDE	0x4376
-
-#define PCI_VENDOR_ID_VLSI		0x1004
-#define PCI_DEVICE_ID_VLSI_82C534	0x0102
-#define PCI_DEVICE_ID_VLSI_82C147	0x0105
-
-
-#define PCI_VENDOR_ID_NS		0x100b
-#define PCI_DEVICE_ID_NS_87415		0x0002
-#define PCI_DEVICE_ID_NS_87560_LIO	0x000e
-#define PCI_DEVICE_ID_NS_87560_USB	0x0012
-#define PCI_DEVICE_ID_NS_83815		0x0020
-#define PCI_DEVICE_ID_NS_SCx200_BRIDGE	0x0500
-#define PCI_DEVICE_ID_NS_SCx200_IDE	0x0502
-#define PCI_DEVICE_ID_NS_SCx200_XBUS	0x0505
-#define PCI_DEVICE_ID_NS_SC1100_BRIDGE	0x0510
-#define PCI_DEVICE_ID_NS_SC1100_XBUS	0x0515
-#define PCI_DEVICE_ID_NS_87410		0xd001
-
-
-#define PCI_VENDOR_ID_DEC		0x1011
-#define PCI_DEVICE_ID_DEC_TULIP		0x0002
-#define PCI_DEVICE_ID_DEC_TGA		0x0004
-#define PCI_DEVICE_ID_DEC_TULIP_FAST	0x0009
-#define PCI_DEVICE_ID_DEC_FDDI		0x000F
-#define PCI_DEVICE_ID_DEC_TULIP_PLUS	0x0014
-#define PCI_DEVICE_ID_DEC_21142		0x0019
-#define PCI_DEVICE_ID_DEC_21150		0x0022
-#define PCI_DEVICE_ID_DEC_21153		0x0025
-#define PCI_DEVICE_ID_DEC_21154		0x0026
-#define PCI_DEVICE_ID_DEC_21285		0x1065
-#define PCI_DEVICE_ID_COMPAQ_42XX	0x0046
-
-#define PCI_VENDOR_ID_CIRRUS		0x1013
-#define PCI_DEVICE_ID_CIRRUS_7548	0x0038
-#define PCI_DEVICE_ID_CIRRUS_5430	0x00a0
-#define PCI_DEVICE_ID_CIRRUS_5434_4	0x00a4
-#define PCI_DEVICE_ID_CIRRUS_5434_8	0x00a8
-#define PCI_DEVICE_ID_CIRRUS_5436	0x00ac
-#define PCI_DEVICE_ID_CIRRUS_5446	0x00b8
-#define PCI_DEVICE_ID_CIRRUS_5480	0x00bc
-#define PCI_DEVICE_ID_CIRRUS_5462	0x00d0
-#define PCI_DEVICE_ID_CIRRUS_5464	0x00d4
-#define PCI_DEVICE_ID_CIRRUS_5465	0x00d6
-#define PCI_DEVICE_ID_CIRRUS_6729	0x1100
-#define PCI_DEVICE_ID_CIRRUS_6832	0x1110
-#define PCI_DEVICE_ID_CIRRUS_7543	0x1202
-#define PCI_DEVICE_ID_CIRRUS_4610	0x6001
-#define PCI_DEVICE_ID_CIRRUS_4612	0x6003
-#define PCI_DEVICE_ID_CIRRUS_4615	0x6004
-
-#define PCI_VENDOR_ID_IBM		0x1014
-#define PCI_DEVICE_ID_IBM_TR		0x0018
-#define PCI_DEVICE_ID_IBM_TR_WAKE	0x003e
-#define PCI_DEVICE_ID_IBM_CPC710_PCI64	0x00fc
-#define PCI_DEVICE_ID_IBM_SNIPE		0x0180
+#define PCI_DEVICE_ID_ATI_IXP200_IDE		0x4349
+#define PCI_DEVICE_ID_ATI_IXP300_IDE		0x4369
+#define PCI_DEVICE_ID_ATI_IXP400_IDE		0x4376
+
+#define PCI_VENDOR_ID_VLSI			0x1004
+#define PCI_DEVICE_ID_VLSI_82C534		0x0102
+#define PCI_DEVICE_ID_VLSI_82C147		0x0105
+
+#define PCI_VENDOR_ID_NS			0x100b
+#define PCI_DEVICE_ID_NS_87415			0x0002
+#define PCI_DEVICE_ID_NS_87560_LIO		0x000e
+#define PCI_DEVICE_ID_NS_87560_USB		0x0012
+#define PCI_DEVICE_ID_NS_83815			0x0020
+#define PCI_DEVICE_ID_NS_SCx200_BRIDGE		0x0500
+#define PCI_DEVICE_ID_NS_SCx200_IDE		0x0502
+#define PCI_DEVICE_ID_NS_SCx200_XBUS		0x0505
+#define PCI_DEVICE_ID_NS_SC1100_BRIDGE		0x0510
+#define PCI_DEVICE_ID_NS_SC1100_XBUS		0x0515
+#define PCI_DEVICE_ID_NS_87410			0xd001
+
+#define PCI_VENDOR_ID_DEC			0x1011
+#define PCI_DEVICE_ID_DEC_TULIP			0x0002
+#define PCI_DEVICE_ID_DEC_TGA			0x0004
+#define PCI_DEVICE_ID_DEC_TULIP_FAST		0x0009
+#define PCI_DEVICE_ID_DEC_FDDI			0x000F
+#define PCI_DEVICE_ID_DEC_TULIP_PLUS		0x0014
+#define PCI_DEVICE_ID_DEC_21142			0x0019
+#define PCI_DEVICE_ID_DEC_21150			0x0022
+#define PCI_DEVICE_ID_DEC_21153			0x0025
+#define PCI_DEVICE_ID_DEC_21154			0x0026
+#define PCI_DEVICE_ID_DEC_21285			0x1065
+#define PCI_DEVICE_ID_COMPAQ_42XX		0x0046
+
+#define PCI_VENDOR_ID_CIRRUS			0x1013
+#define PCI_DEVICE_ID_CIRRUS_7548		0x0038
+#define PCI_DEVICE_ID_CIRRUS_5430		0x00a0
+#define PCI_DEVICE_ID_CIRRUS_5434_4		0x00a4
+#define PCI_DEVICE_ID_CIRRUS_5434_8		0x00a8
+#define PCI_DEVICE_ID_CIRRUS_5436		0x00ac
+#define PCI_DEVICE_ID_CIRRUS_5446		0x00b8
+#define PCI_DEVICE_ID_CIRRUS_5480		0x00bc
+#define PCI_DEVICE_ID_CIRRUS_5462		0x00d0
+#define PCI_DEVICE_ID_CIRRUS_5464		0x00d4
+#define PCI_DEVICE_ID_CIRRUS_5465		0x00d6
+#define PCI_DEVICE_ID_CIRRUS_6729		0x1100
+#define PCI_DEVICE_ID_CIRRUS_6832		0x1110
+#define PCI_DEVICE_ID_CIRRUS_7543		0x1202
+#define PCI_DEVICE_ID_CIRRUS_4610		0x6001
+#define PCI_DEVICE_ID_CIRRUS_4612		0x6003
+#define PCI_DEVICE_ID_CIRRUS_4615		0x6004
+
+#define PCI_VENDOR_ID_IBM			0x1014
+#define PCI_DEVICE_ID_IBM_TR			0x0018
+#define PCI_DEVICE_ID_IBM_TR_WAKE		0x003e
+#define PCI_DEVICE_ID_IBM_CPC710_PCI64		0x00fc
+#define PCI_DEVICE_ID_IBM_SNIPE			0x0180
 #define PCI_DEVICE_ID_IBM_CITRINE		0x028C
 #define PCI_DEVICE_ID_IBM_GEMSTONE		0xB166
-#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
-#define PCI_DEVICE_ID_IBM_ICOM_V2_ONE_PORT_RVX_ONE_PORT_MDM	0x0251
+#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
+#define PCI_DEVICE_ID_IBM_ICOM_V2_ONE_PORT_RVX_ONE_PORT_MDM 0x0251
 #define PCI_DEVICE_ID_IBM_ICOM_FOUR_PORT_MODEL	0x252
 
-#define PCI_VENDOR_ID_COMPEX2		0x101a // pci.ids says "AT&T GIS (NCR)"
-#define PCI_DEVICE_ID_COMPEX2_100VG	0x0005
-
-#define PCI_VENDOR_ID_WD		0x101c
-#define PCI_DEVICE_ID_WD_90C		0xc24a
-
-#define PCI_VENDOR_ID_AMI		0x101e
-#define PCI_DEVICE_ID_AMI_MEGARAID3	0x1960
-#define PCI_DEVICE_ID_AMI_MEGARAID	0x9010
-#define PCI_DEVICE_ID_AMI_MEGARAID2	0x9060
-
-#define PCI_VENDOR_ID_AMD		0x1022
-#define PCI_DEVICE_ID_AMD_K8_NB		0x1100
-#define PCI_DEVICE_ID_AMD_LANCE		0x2000
-#define PCI_DEVICE_ID_AMD_LANCE_HOME	0x2001
-#define PCI_DEVICE_ID_AMD_SCSI		0x2020
-#define PCI_DEVICE_ID_AMD_SERENADE	0x36c0
-#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
-#define PCI_DEVICE_ID_AMD_FE_GATE_700E	0x700E
-#define PCI_DEVICE_ID_AMD_COBRA_7401	0x7401
-#define PCI_DEVICE_ID_AMD_VIPER_7409	0x7409
-#define PCI_DEVICE_ID_AMD_VIPER_740B	0x740B
-#define PCI_DEVICE_ID_AMD_VIPER_7410	0x7410
-#define PCI_DEVICE_ID_AMD_VIPER_7411	0x7411
-#define PCI_DEVICE_ID_AMD_VIPER_7413	0x7413
-#define PCI_DEVICE_ID_AMD_VIPER_7440	0x7440
-#define PCI_DEVICE_ID_AMD_OPUS_7441	0x7441
-#define PCI_DEVICE_ID_AMD_OPUS_7443	0x7443
-#define PCI_DEVICE_ID_AMD_VIPER_7443	0x7443
-#define PCI_DEVICE_ID_AMD_OPUS_7445	0x7445
-#define PCI_DEVICE_ID_AMD_8111_LPC	0x7468
-#define PCI_DEVICE_ID_AMD_8111_IDE	0x7469
-#define PCI_DEVICE_ID_AMD_8111_SMBUS2	0x746a
-#define PCI_DEVICE_ID_AMD_8111_SMBUS	0x746b
-#define PCI_DEVICE_ID_AMD_8111_AUDIO	0x746d
-#define PCI_DEVICE_ID_AMD_8151_0	0x7454
-#define PCI_DEVICE_ID_AMD_8131_APIC     0x7450
-
-#define PCI_VENDOR_ID_TRIDENT		0x1023
-#define PCI_DEVICE_ID_TRIDENT_4DWAVE_DX	0x2000
-#define PCI_DEVICE_ID_TRIDENT_4DWAVE_NX	0x2001
-
-
-#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_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_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_VENDOR_ID_CT		0x102c
-#define PCI_DEVICE_ID_CT_69000		0x00c0
-#define PCI_DEVICE_ID_CT_65550		0x00e0
-
-#define PCI_VENDOR_ID_MIRO		0x1031
-#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_CBUS_2	0x002d /* PCI-Cbus Bridge */
-#define PCI_DEVICE_ID_NEC_CBUS_3	0x003b
-#define PCI_DEVICE_ID_NEC_NAPCCARD	0x003e
-#define PCI_DEVICE_ID_NEC_NILE4		0x005a
-#define PCI_DEVICE_ID_NEC_VRC4173	0x00a5
-#define PCI_DEVICE_ID_NEC_VRC5477_AC97  0x00a6
-
-#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_503		0x0008
-#define PCI_DEVICE_ID_SI_SMBUS		0x0016
-#define PCI_DEVICE_ID_SI_LPC		0x0018
-#define PCI_DEVICE_ID_SI_496		0x0496
-#define PCI_DEVICE_ID_SI_300		0x0300
-#define PCI_DEVICE_ID_SI_315H		0x0310
-#define PCI_DEVICE_ID_SI_315		0x0315
-#define PCI_DEVICE_ID_SI_315PRO		0x0325
-#define PCI_DEVICE_ID_SI_530		0x0530
-#define PCI_DEVICE_ID_SI_540		0x0540
-#define PCI_DEVICE_ID_SI_550		0x0550
-#define PCI_DEVICE_ID_SI_540_VGA	0x5300
-#define PCI_DEVICE_ID_SI_550_VGA	0x5315
-#define PCI_DEVICE_ID_SI_620		0x0620
-#define PCI_DEVICE_ID_SI_630		0x0630
-#define PCI_DEVICE_ID_SI_633		0x0633
-#define PCI_DEVICE_ID_SI_635		0x0635
-#define PCI_DEVICE_ID_SI_640		0x0640
-#define PCI_DEVICE_ID_SI_645		0x0645
-#define PCI_DEVICE_ID_SI_646		0x0646
-#define PCI_DEVICE_ID_SI_648		0x0648
-#define PCI_DEVICE_ID_SI_650		0x0650
-#define PCI_DEVICE_ID_SI_651		0x0651
-#define PCI_DEVICE_ID_SI_655		0x0655
-#define PCI_DEVICE_ID_SI_661		0x0661
-#define PCI_DEVICE_ID_SI_730		0x0730
-#define PCI_DEVICE_ID_SI_733		0x0733
-#define PCI_DEVICE_ID_SI_630_VGA	0x6300
-#define PCI_DEVICE_ID_SI_735		0x0735
-#define PCI_DEVICE_ID_SI_740		0x0740
-#define PCI_DEVICE_ID_SI_741		0x0741
-#define PCI_DEVICE_ID_SI_745		0x0745
-#define PCI_DEVICE_ID_SI_746		0x0746
-#define PCI_DEVICE_ID_SI_755		0x0755
-#define PCI_DEVICE_ID_SI_760		0x0760
-#define PCI_DEVICE_ID_SI_900		0x0900
-#define PCI_DEVICE_ID_SI_961		0x0961
-#define PCI_DEVICE_ID_SI_962		0x0962
-#define PCI_DEVICE_ID_SI_963		0x0963
-#define PCI_DEVICE_ID_SI_5511		0x5511
-#define PCI_DEVICE_ID_SI_5513		0x5513
-#define PCI_DEVICE_ID_SI_5518		0x5518
-#define PCI_DEVICE_ID_SI_5571		0x5571
-#define PCI_DEVICE_ID_SI_5581		0x5581
-#define PCI_DEVICE_ID_SI_5582		0x5582
-#define PCI_DEVICE_ID_SI_5591		0x5591
-#define PCI_DEVICE_ID_SI_5596		0x5596
-#define PCI_DEVICE_ID_SI_5597		0x5597
-#define PCI_DEVICE_ID_SI_5598		0x5598
-#define PCI_DEVICE_ID_SI_5600		0x5600
-#define PCI_DEVICE_ID_SI_7012		0x7012
-#define PCI_DEVICE_ID_SI_7013		0x7013
-#define PCI_DEVICE_ID_SI_7016		0x7016
-#define PCI_DEVICE_ID_SI_7018		0x7018
-
-#define PCI_VENDOR_ID_HP		0x103c
-#define PCI_DEVICE_ID_HP_VISUALIZE_EG	0x1005
-#define PCI_DEVICE_ID_HP_VISUALIZE_FX6	0x1006
-#define PCI_DEVICE_ID_HP_VISUALIZE_FX4	0x1008
-#define PCI_DEVICE_ID_HP_VISUALIZE_FX2	0x100a
-#define PCI_DEVICE_ID_HP_TACHYON	0x1028
-#define PCI_DEVICE_ID_HP_TACHLITE	0x1029
-#define PCI_DEVICE_ID_HP_J2585A		0x1030
-#define PCI_DEVICE_ID_HP_J2585B		0x1031
-#define PCI_DEVICE_ID_HP_J2973A		0x1040
-#define PCI_DEVICE_ID_HP_J2970A		0x1042
-#define PCI_DEVICE_ID_HP_DIVA		0x1048
-#define PCI_DEVICE_ID_HP_DIVA_TOSCA1	0x1049
-#define PCI_DEVICE_ID_HP_DIVA_TOSCA2	0x104A
-#define PCI_DEVICE_ID_HP_DIVA_MAESTRO	0x104B
-#define PCI_DEVICE_ID_HP_REO_IOC	0x10f1
-#define PCI_DEVICE_ID_HP_VISUALIZE_FXE	0x108b
-#define PCI_DEVICE_ID_HP_DIVA_HALFDOME	0x1223
-#define PCI_DEVICE_ID_HP_DIVA_KEYSTONE	0x1226
-#define PCI_DEVICE_ID_HP_DIVA_POWERBAR	0x1227
-#define PCI_DEVICE_ID_HP_ZX1_IOC	0x122a
-#define PCI_DEVICE_ID_HP_PCIX_LBA	0x122e
-#define PCI_DEVICE_ID_HP_SX1000_IOC	0x127c
-#define PCI_DEVICE_ID_HP_DIVA_EVEREST	0x1282
-#define PCI_DEVICE_ID_HP_DIVA_AUX	0x1290
-#define PCI_DEVICE_ID_HP_DIVA_RMP3	0x1301
-#define PCI_DEVICE_ID_HP_CISSA		0x3220
-#define PCI_DEVICE_ID_HP_CISSC		0x3230
-#define PCI_DEVICE_ID_HP_CISSD		0x3238
-#define PCI_DEVICE_ID_HP_ZX2_IOC	0x4031
-
-#define PCI_VENDOR_ID_PCTECH		0x1042
-#define PCI_DEVICE_ID_PCTECH_RZ1000	0x1000
-#define PCI_DEVICE_ID_PCTECH_RZ1001	0x1001
-#define PCI_DEVICE_ID_PCTECH_SAMURAI_IDE 0x3020
-
-#define PCI_VENDOR_ID_ASUSTEK		0x1043
-#define PCI_DEVICE_ID_ASUSTEK_0675	0x0675
-
-#define PCI_VENDOR_ID_DPT		0x1044
-#define PCI_DEVICE_ID_DPT		0xa400
-
-#define PCI_VENDOR_ID_OPTI		0x1045
-#define PCI_DEVICE_ID_OPTI_82C558	0xc558
-#define PCI_DEVICE_ID_OPTI_82C621	0xc621
-#define PCI_DEVICE_ID_OPTI_82C700	0xc700
-#define PCI_DEVICE_ID_OPTI_82C825	0xd568
-
-#define PCI_VENDOR_ID_ELSA		0x1048
-#define PCI_DEVICE_ID_ELSA_MICROLINK	0x1000
-#define PCI_DEVICE_ID_ELSA_QS3000	0x3000
-
-
-#define PCI_VENDOR_ID_BUSLOGIC		      0x104B
-#define PCI_DEVICE_ID_BUSLOGIC_MULTIMASTER_NC 0x0140
-#define PCI_DEVICE_ID_BUSLOGIC_MULTIMASTER    0x1040
-#define PCI_DEVICE_ID_BUSLOGIC_FLASHPOINT     0x8130
-
-#define PCI_VENDOR_ID_TI		0x104c
-#define PCI_DEVICE_ID_TI_TVP4020	0x3d07
-#define PCI_DEVICE_ID_TI_4450		0x8011
-#define PCI_DEVICE_ID_TI_XX21_XX11	0x8031
-#define PCI_DEVICE_ID_TI_X515		0x8036
-#define PCI_DEVICE_ID_TI_1130		0xac12
-#define PCI_DEVICE_ID_TI_1031		0xac13
-#define PCI_DEVICE_ID_TI_1131		0xac15
-#define PCI_DEVICE_ID_TI_1250		0xac16
-#define PCI_DEVICE_ID_TI_1220		0xac17
-#define PCI_DEVICE_ID_TI_1221		0xac19
-#define PCI_DEVICE_ID_TI_1210		0xac1a
-#define PCI_DEVICE_ID_TI_1450		0xac1b
-#define PCI_DEVICE_ID_TI_1225		0xac1c
-#define PCI_DEVICE_ID_TI_1251A		0xac1d
-#define PCI_DEVICE_ID_TI_1211		0xac1e
-#define PCI_DEVICE_ID_TI_1251B		0xac1f
-#define PCI_DEVICE_ID_TI_4410		0xac41
-#define PCI_DEVICE_ID_TI_4451		0xac42
-#define PCI_DEVICE_ID_TI_4510		0xac44
-#define PCI_DEVICE_ID_TI_4520		0xac46
-#define PCI_DEVICE_ID_TI_7510		0xac47
-#define PCI_DEVICE_ID_TI_7610		0xac48
-#define PCI_DEVICE_ID_TI_7410		0xac49
-#define PCI_DEVICE_ID_TI_1410		0xac50
-#define PCI_DEVICE_ID_TI_1420		0xac51
-#define PCI_DEVICE_ID_TI_1451A		0xac52
-#define PCI_DEVICE_ID_TI_1620		0xac54
-#define PCI_DEVICE_ID_TI_1520		0xac55
-#define PCI_DEVICE_ID_TI_1510		0xac56
-#define PCI_DEVICE_ID_TI_X620		0xac8d
-#define PCI_DEVICE_ID_TI_X420		0xac8e
-
-#define PCI_VENDOR_ID_SONY		0x104d
+/* pci.ids says "AT&T GIS (NCR)" */
+#define PCI_VENDOR_ID_COMPEX2			0x101a
+#define PCI_DEVICE_ID_COMPEX2_100VG		0x0005
+
+#define PCI_VENDOR_ID_WD			0x101c
+#define PCI_DEVICE_ID_WD_90C			0xc24a
+
+#define PCI_VENDOR_ID_AMI			0x101e
+#define PCI_DEVICE_ID_AMI_MEGARAID3		0x1960
+#define PCI_DEVICE_ID_AMI_MEGARAID		0x9010
+#define PCI_DEVICE_ID_AMI_MEGARAID2		0x9060
+
+#define PCI_VENDOR_ID_AMD			0x1022
+#define PCI_DEVICE_ID_AMD_K8_NB			0x1100
+#define PCI_DEVICE_ID_AMD_LANCE			0x2000
+#define PCI_DEVICE_ID_AMD_LANCE_HOME		0x2001
+#define PCI_DEVICE_ID_AMD_SCSI			0x2020
+#define PCI_DEVICE_ID_AMD_SERENADE		0x36c0
+#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
+#define PCI_DEVICE_ID_AMD_FE_GATE_700E		0x700E
+#define PCI_DEVICE_ID_AMD_COBRA_7401		0x7401
+#define PCI_DEVICE_ID_AMD_VIPER_7409		0x7409
+#define PCI_DEVICE_ID_AMD_VIPER_740B		0x740B
+#define PCI_DEVICE_ID_AMD_VIPER_7410		0x7410
+#define PCI_DEVICE_ID_AMD_VIPER_7411		0x7411
+#define PCI_DEVICE_ID_AMD_VIPER_7413		0x7413
+#define PCI_DEVICE_ID_AMD_VIPER_7440		0x7440
+#define PCI_DEVICE_ID_AMD_OPUS_7441		0x7441
+#define PCI_DEVICE_ID_AMD_OPUS_7443		0x7443
+#define PCI_DEVICE_ID_AMD_VIPER_7443		0x7443
+#define PCI_DEVICE_ID_AMD_OPUS_7445		0x7445
+#define PCI_DEVICE_ID_AMD_8111_LPC		0x7468
+#define PCI_DEVICE_ID_AMD_8111_IDE		0x7469
+#define PCI_DEVICE_ID_AMD_8111_SMBUS2		0x746a
+#define PCI_DEVICE_ID_AMD_8111_SMBUS		0x746b
+#define PCI_DEVICE_ID_AMD_8111_AUDIO		0x746d
+#define PCI_DEVICE_ID_AMD_8151_0		0x7454
+#define PCI_DEVICE_ID_AMD_8131_APIC		0x7450
+
+#define PCI_VENDOR_ID_TRIDENT			0x1023
+#define PCI_DEVICE_ID_TRIDENT_4DWAVE_DX		0x2000
+#define PCI_DEVICE_ID_TRIDENT_4DWAVE_NX		0x2001
+
+#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_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_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_VENDOR_ID_CT			0x102c
+#define PCI_DEVICE_ID_CT_69000			0x00c0
+#define PCI_DEVICE_ID_CT_65550			0x00e0
+
+#define PCI_VENDOR_ID_MIRO			0x1031
+#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_CBUS_2		0x002d /* PCI-Cbus Bridge */
+#define PCI_DEVICE_ID_NEC_CBUS_3		0x003b
+#define PCI_DEVICE_ID_NEC_NAPCCARD		0x003e
+#define PCI_DEVICE_ID_NEC_NILE4			0x005a
+#define PCI_DEVICE_ID_NEC_VRC4173		0x00a5
+#define PCI_DEVICE_ID_NEC_VRC5477_AC97		0x00a6
+
+#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_503			0x0008
+#define PCI_DEVICE_ID_SI_SMBUS			0x0016
+#define PCI_DEVICE_ID_SI_LPC			0x0018
+#define PCI_DEVICE_ID_SI_496			0x0496
+#define PCI_DEVICE_ID_SI_300			0x0300
+#define PCI_DEVICE_ID_SI_315H			0x0310
+#define PCI_DEVICE_ID_SI_315			0x0315
+#define PCI_DEVICE_ID_SI_315PRO			0x0325
+#define PCI_DEVICE_ID_SI_530			0x0530
+#define PCI_DEVICE_ID_SI_540			0x0540
+#define PCI_DEVICE_ID_SI_550			0x0550
+#define PCI_DEVICE_ID_SI_540_VGA		0x5300
+#define PCI_DEVICE_ID_SI_550_VGA		0x5315
+#define PCI_DEVICE_ID_SI_620			0x0620
+#define PCI_DEVICE_ID_SI_630			0x0630
+#define PCI_DEVICE_ID_SI_633			0x0633
+#define PCI_DEVICE_ID_SI_635			0x0635
+#define PCI_DEVICE_ID_SI_640			0x0640
+#define PCI_DEVICE_ID_SI_645			0x0645
+#define PCI_DEVICE_ID_SI_646			0x0646
+#define PCI_DEVICE_ID_SI_648			0x0648
+#define PCI_DEVICE_ID_SI_650			0x0650
+#define PCI_DEVICE_ID_SI_651			0x0651
+#define PCI_DEVICE_ID_SI_655			0x0655
+#define PCI_DEVICE_ID_SI_661			0x0661
+#define PCI_DEVICE_ID_SI_730			0x0730
+#define PCI_DEVICE_ID_SI_733			0x0733
+#define PCI_DEVICE_ID_SI_630_VGA		0x6300
+#define PCI_DEVICE_ID_SI_735			0x0735
+#define PCI_DEVICE_ID_SI_740			0x0740
+#define PCI_DEVICE_ID_SI_741			0x0741
+#define PCI_DEVICE_ID_SI_745			0x0745
+#define PCI_DEVICE_ID_SI_746			0x0746
+#define PCI_DEVICE_ID_SI_755			0x0755
+#define PCI_DEVICE_ID_SI_760			0x0760
+#define PCI_DEVICE_ID_SI_900			0x0900
+#define PCI_DEVICE_ID_SI_961			0x0961
+#define PCI_DEVICE_ID_SI_962			0x0962
+#define PCI_DEVICE_ID_SI_963			0x0963
+#define PCI_DEVICE_ID_SI_5511			0x5511
+#define PCI_DEVICE_ID_SI_5513			0x5513
+#define PCI_DEVICE_ID_SI_5518			0x5518
+#define PCI_DEVICE_ID_SI_5571			0x5571
+#define PCI_DEVICE_ID_SI_5581			0x5581
+#define PCI_DEVICE_ID_SI_5582			0x5582
+#define PCI_DEVICE_ID_SI_5591			0x5591
+#define PCI_DEVICE_ID_SI_5596			0x5596
+#define PCI_DEVICE_ID_SI_5597			0x5597
+#define PCI_DEVICE_ID_SI_5598			0x5598
+#define PCI_DEVICE_ID_SI_5600			0x5600
+#define PCI_DEVICE_ID_SI_7012			0x7012
+#define PCI_DEVICE_ID_SI_7013			0x7013
+#define PCI_DEVICE_ID_SI_7016			0x7016
+#define PCI_DEVICE_ID_SI_7018			0x7018
+
+#define PCI_VENDOR_ID_HP			0x103c
+#define PCI_DEVICE_ID_HP_VISUALIZE_EG		0x1005
+#define PCI_DEVICE_ID_HP_VISUALIZE_FX6		0x1006
+#define PCI_DEVICE_ID_HP_VISUALIZE_FX4		0x1008
+#define PCI_DEVICE_ID_HP_VISUALIZE_FX2		0x100a
+#define PCI_DEVICE_ID_HP_TACHYON		0x1028
+#define PCI_DEVICE_ID_HP_TACHLITE		0x1029
+#define PCI_DEVICE_ID_HP_J2585A			0x1030
+#define PCI_DEVICE_ID_HP_J2585B			0x1031
+#define PCI_DEVICE_ID_HP_J2973A			0x1040
+#define PCI_DEVICE_ID_HP_J2970A			0x1042
+#define PCI_DEVICE_ID_HP_DIVA			0x1048
+#define PCI_DEVICE_ID_HP_DIVA_TOSCA1		0x1049
+#define PCI_DEVICE_ID_HP_DIVA_TOSCA2		0x104A
+#define PCI_DEVICE_ID_HP_DIVA_MAESTRO		0x104B
+#define PCI_DEVICE_ID_HP_REO_IOC		0x10f1
+#define PCI_DEVICE_ID_HP_VISUALIZE_FXE		0x108b
+#define PCI_DEVICE_ID_HP_DIVA_HALFDOME		0x1223
+#define PCI_DEVICE_ID_HP_DIVA_KEYSTONE		0x1226
+#define PCI_DEVICE_ID_HP_DIVA_POWERBAR		0x1227
+#define PCI_DEVICE_ID_HP_ZX1_IOC		0x122a
+#define PCI_DEVICE_ID_HP_PCIX_LBA		0x122e
+#define PCI_DEVICE_ID_HP_SX1000_IOC		0x127c
+#define PCI_DEVICE_ID_HP_DIVA_EVEREST		0x1282
+#define PCI_DEVICE_ID_HP_DIVA_AUX		0x1290
+#define PCI_DEVICE_ID_HP_DIVA_RMP3		0x1301
+#define PCI_DEVICE_ID_HP_CISSA			0x3220
+#define PCI_DEVICE_ID_HP_CISSC			0x3230
+#define PCI_DEVICE_ID_HP_CISSD			0x3238
+#define PCI_DEVICE_ID_HP_ZX2_IOC		0x4031
+
+#define PCI_VENDOR_ID_PCTECH			0x1042
+#define PCI_DEVICE_ID_PCTECH_RZ1000		0x1000
+#define PCI_DEVICE_ID_PCTECH_RZ1001		0x1001
+#define PCI_DEVICE_ID_PCTECH_SAMURAI_IDE	0x3020
+
+#define PCI_VENDOR_ID_ASUSTEK			0x1043
+#define PCI_DEVICE_ID_ASUSTEK_0675		0x0675
+
+#define PCI_VENDOR_ID_DPT			0x1044
+#define PCI_DEVICE_ID_DPT			0xa400
+
+#define PCI_VENDOR_ID_OPTI			0x1045
+#define PCI_DEVICE_ID_OPTI_82C558		0xc558
+#define PCI_DEVICE_ID_OPTI_82C621		0xc621
+#define PCI_DEVICE_ID_OPTI_82C700		0xc700
+#define PCI_DEVICE_ID_OPTI_82C825		0xd568
+
+#define PCI_VENDOR_ID_ELSA			0x1048
+#define PCI_DEVICE_ID_ELSA_MICROLINK		0x1000
+#define PCI_DEVICE_ID_ELSA_QS3000		0x3000
+
+#define PCI_VENDOR_ID_BUSLOGIC			0x104B
+#define PCI_DEVICE_ID_BUSLOGIC_MULTIMASTER_NC	0x0140
+#define PCI_DEVICE_ID_BUSLOGIC_MULTIMASTER	0x1040
+#define PCI_DEVICE_ID_BUSLOGIC_FLASHPOINT	0x8130
+
+#define PCI_VENDOR_ID_TI			0x104c
+#define PCI_DEVICE_ID_TI_TVP4020		0x3d07
+#define PCI_DEVICE_ID_TI_4450			0x8011
+#define PCI_DEVICE_ID_TI_XX21_XX11		0x8031
+#define PCI_DEVICE_ID_TI_X515			0x8036
+#define PCI_DEVICE_ID_TI_1130			0xac12
+#define PCI_DEVICE_ID_TI_1031			0xac13
+#define PCI_DEVICE_ID_TI_1131			0xac15
+#define PCI_DEVICE_ID_TI_1250			0xac16
+#define PCI_DEVICE_ID_TI_1220			0xac17
+#define PCI_DEVICE_ID_TI_1221			0xac19
+#define PCI_DEVICE_ID_TI_1210			0xac1a
+#define PCI_DEVICE_ID_TI_1450			0xac1b
+#define PCI_DEVICE_ID_TI_1225			0xac1c
+#define PCI_DEVICE_ID_TI_1251A			0xac1d
+#define PCI_DEVICE_ID_TI_1211			0xac1e
+#define PCI_DEVICE_ID_TI_1251B			0xac1f
+#define PCI_DEVICE_ID_TI_4410			0xac41
+#define PCI_DEVICE_ID_TI_4451			0xac42
+#define PCI_DEVICE_ID_TI_4510			0xac44
+#define PCI_DEVICE_ID_TI_4520			0xac46
+#define PCI_DEVICE_ID_TI_7510			0xac47
+#define PCI_DEVICE_ID_TI_7610			0xac48
+#define PCI_DEVICE_ID_TI_7410			0xac49
+#define PCI_DEVICE_ID_TI_1410			0xac50
+#define PCI_DEVICE_ID_TI_1420			0xac51
+#define PCI_DEVICE_ID_TI_1451A			0xac52
+#define PCI_DEVICE_ID_TI_1620			0xac54
+#define PCI_DEVICE_ID_TI_1520			0xac55
+#define PCI_DEVICE_ID_TI_1510			0xac56
+#define PCI_DEVICE_ID_TI_X620			0xac8d
+#define PCI_DEVICE_ID_TI_X420			0xac8e
 
+#define PCI_VENDOR_ID_SONY			0x104d
 
 /* Winbond have two vendor IDs! See 0x10ad as well */
-#define PCI_VENDOR_ID_WINBOND2		0x1050
-#define PCI_DEVICE_ID_WINBOND2_89C940F	0x5a5a
-#define PCI_DEVICE_ID_WINBOND2_6692	0x6692
-
-#define PCI_VENDOR_ID_ANIGMA		0x1051
-#define PCI_DEVICE_ID_ANIGMA_MC145575	0x0100
-  
-#define PCI_VENDOR_ID_EFAR		0x1055
-#define PCI_DEVICE_ID_EFAR_SLC90E66_1	0x9130
-#define PCI_DEVICE_ID_EFAR_SLC90E66_3	0x9463
-
-#define PCI_VENDOR_ID_MOTOROLA		0x1057
-#define PCI_DEVICE_ID_MOTOROLA_MPC105	0x0001
-#define PCI_DEVICE_ID_MOTOROLA_MPC106	0x0002
-#define PCI_DEVICE_ID_MOTOROLA_MPC107	0x0004
-#define PCI_DEVICE_ID_MOTOROLA_RAVEN	0x4801
-#define PCI_DEVICE_ID_MOTOROLA_FALCON	0x4802
-#define PCI_DEVICE_ID_MOTOROLA_HAWK	0x4803
-#define PCI_DEVICE_ID_MOTOROLA_HARRIER	0x480b
-#define PCI_DEVICE_ID_MOTOROLA_MPC5200	0x5803
-
-#define PCI_VENDOR_ID_PROMISE		0x105a
-#define PCI_DEVICE_ID_PROMISE_20265	0x0d30
-#define PCI_DEVICE_ID_PROMISE_20267	0x4d30
-#define PCI_DEVICE_ID_PROMISE_20246	0x4d33
-#define PCI_DEVICE_ID_PROMISE_20262	0x4d38
-#define PCI_DEVICE_ID_PROMISE_20263	0x0D38
-#define PCI_DEVICE_ID_PROMISE_20268	0x4d68
-#define PCI_DEVICE_ID_PROMISE_20269	0x4d69
-#define PCI_DEVICE_ID_PROMISE_20270	0x6268
-#define PCI_DEVICE_ID_PROMISE_20271	0x6269
-#define PCI_DEVICE_ID_PROMISE_20275	0x1275
-#define PCI_DEVICE_ID_PROMISE_20276	0x5275
-#define PCI_DEVICE_ID_PROMISE_20277	0x7275
-
-
-#define PCI_VENDOR_ID_UMC		0x1060
-#define PCI_DEVICE_ID_UMC_UM8673F	0x0101
-#define PCI_DEVICE_ID_UMC_UM8886BF	0x673a
-#define PCI_DEVICE_ID_UMC_UM8886A	0x886a
-
-
-#define PCI_VENDOR_ID_MYLEX		0x1069
-#define PCI_DEVICE_ID_MYLEX_DAC960_P	0x0001
-#define PCI_DEVICE_ID_MYLEX_DAC960_PD	0x0002
-#define PCI_DEVICE_ID_MYLEX_DAC960_PG	0x0010
-#define PCI_DEVICE_ID_MYLEX_DAC960_LA	0x0020
-#define PCI_DEVICE_ID_MYLEX_DAC960_LP	0x0050
-#define PCI_DEVICE_ID_MYLEX_DAC960_BA	0xBA56
-#define PCI_DEVICE_ID_MYLEX_DAC960_GEM	0xB166
-
-
-#define PCI_VENDOR_ID_APPLE		0x106b
-#define PCI_DEVICE_ID_APPLE_BANDIT	0x0001
-#define PCI_DEVICE_ID_APPLE_HYDRA	0x000e
-#define PCI_DEVICE_ID_APPLE_UNI_N_FW	0x0018
-#define PCI_DEVICE_ID_APPLE_UNI_N_AGP	0x0020
-#define PCI_DEVICE_ID_APPLE_UNI_N_GMAC	0x0021
-#define PCI_DEVICE_ID_APPLE_UNI_N_GMACP	0x0024
-#define PCI_DEVICE_ID_APPLE_UNI_N_AGP_P	0x0027
-#define PCI_DEVICE_ID_APPLE_UNI_N_AGP15	0x002d
-#define PCI_DEVICE_ID_APPLE_UNI_N_PCI15	0x002e
-#define PCI_DEVICE_ID_APPLE_UNI_N_GMAC2	0x0032
-#define PCI_DEVICE_ID_APPLE_UNI_N_ATA	0x0033
-#define PCI_DEVICE_ID_APPLE_UNI_N_AGP2	0x0034
-#define PCI_DEVICE_ID_APPLE_IPID_ATA100	0x003b
-#define PCI_DEVICE_ID_APPLE_K2_ATA100	0x0043
-#define PCI_DEVICE_ID_APPLE_U3_AGP	0x004b
-#define PCI_DEVICE_ID_APPLE_K2_GMAC	0x004c
-#define PCI_DEVICE_ID_APPLE_SH_ATA      0x0050
-#define PCI_DEVICE_ID_APPLE_SH_SUNGEM   0x0051
-#define PCI_DEVICE_ID_APPLE_U3L_AGP	0x0058
-#define PCI_DEVICE_ID_APPLE_U3H_AGP	0x0059
-#define PCI_DEVICE_ID_APPLE_TIGON3	0x1645
-
-#define PCI_VENDOR_ID_YAMAHA		0x1073
-#define PCI_DEVICE_ID_YAMAHA_724	0x0004
-#define PCI_DEVICE_ID_YAMAHA_724F	0x000d
-#define PCI_DEVICE_ID_YAMAHA_740	0x000a
-#define PCI_DEVICE_ID_YAMAHA_740C	0x000c
-#define PCI_DEVICE_ID_YAMAHA_744	0x0010
-#define PCI_DEVICE_ID_YAMAHA_754	0x0012
-
-
-#define PCI_VENDOR_ID_QLOGIC		0x1077
-#define PCI_DEVICE_ID_QLOGIC_ISP1020	0x1020
-#define PCI_DEVICE_ID_QLOGIC_ISP2100	0x2100
-#define PCI_DEVICE_ID_QLOGIC_ISP2200	0x2200
-#define PCI_DEVICE_ID_QLOGIC_ISP2300	0x2300
-#define PCI_DEVICE_ID_QLOGIC_ISP2312	0x2312
-#define PCI_DEVICE_ID_QLOGIC_ISP2322	0x2322
-#define PCI_DEVICE_ID_QLOGIC_ISP6312	0x6312
-#define PCI_DEVICE_ID_QLOGIC_ISP6322	0x6322
-#define PCI_DEVICE_ID_QLOGIC_ISP2422	0x2422
-#define PCI_DEVICE_ID_QLOGIC_ISP2432	0x2432
-#define PCI_DEVICE_ID_QLOGIC_ISP2512	0x2512
-#define PCI_DEVICE_ID_QLOGIC_ISP2522	0x2522
-
-#define PCI_VENDOR_ID_CYRIX		0x1078
-#define PCI_DEVICE_ID_CYRIX_5510	0x0000
-#define PCI_DEVICE_ID_CYRIX_PCI_MASTER	0x0001
-#define PCI_DEVICE_ID_CYRIX_5520	0x0002
-#define PCI_DEVICE_ID_CYRIX_5530_LEGACY	0x0100
-#define PCI_DEVICE_ID_CYRIX_5530_IDE	0x0102
-#define PCI_DEVICE_ID_CYRIX_5530_AUDIO	0x0103
-#define PCI_DEVICE_ID_CYRIX_5530_VIDEO	0x0104
-
-
-
-#define PCI_VENDOR_ID_CONTAQ		0x1080
-#define PCI_DEVICE_ID_CONTAQ_82C693	0xc693
-
-
-#define PCI_VENDOR_ID_OLICOM		0x108d
-#define PCI_DEVICE_ID_OLICOM_OC2325	0x0012
-#define PCI_DEVICE_ID_OLICOM_OC2183	0x0013
-#define PCI_DEVICE_ID_OLICOM_OC2326	0x0014
-
-#define PCI_VENDOR_ID_SUN		0x108e
-#define PCI_DEVICE_ID_SUN_EBUS		0x1000
-#define PCI_DEVICE_ID_SUN_HAPPYMEAL	0x1001
-#define PCI_DEVICE_ID_SUN_RIO_EBUS	0x1100
-#define PCI_DEVICE_ID_SUN_RIO_GEM	0x1101
-#define PCI_DEVICE_ID_SUN_RIO_1394	0x1102
-#define PCI_DEVICE_ID_SUN_RIO_USB	0x1103
-#define PCI_DEVICE_ID_SUN_GEM		0x2bad
-#define PCI_DEVICE_ID_SUN_SIMBA		0x5000
-#define PCI_DEVICE_ID_SUN_PBM		0x8000
-#define PCI_DEVICE_ID_SUN_SCHIZO	0x8001
-#define PCI_DEVICE_ID_SUN_SABRE		0xa000
-#define PCI_DEVICE_ID_SUN_HUMMINGBIRD	0xa001
-#define PCI_DEVICE_ID_SUN_TOMATILLO	0xa801
-
-#define PCI_VENDOR_ID_CMD		0x1095
-#define PCI_DEVICE_ID_CMD_643		0x0643
-#define PCI_DEVICE_ID_CMD_646		0x0646
-#define PCI_DEVICE_ID_CMD_648		0x0648
-#define PCI_DEVICE_ID_CMD_649		0x0649
-
-#define PCI_DEVICE_ID_SII_680		0x0680
-#define PCI_DEVICE_ID_SII_3112		0x3112
-#define PCI_DEVICE_ID_SII_1210SA	0x0240
-
-
-#define PCI_VENDOR_ID_BROOKTREE		0x109e
-#define PCI_DEVICE_ID_BROOKTREE_878	0x0878
-#define PCI_DEVICE_ID_BROOKTREE_879	0x0879
-
-
-#define PCI_VENDOR_ID_SGI		0x10a9
-#define PCI_DEVICE_ID_SGI_IOC3		0x0003
-#define PCI_DEVICE_ID_SGI_IOC4		0x100a
-#define PCI_VENDOR_ID_SGI_LITHIUM	0x1002
-
-
-#define PCI_VENDOR_ID_WINBOND		0x10ad
-#define PCI_DEVICE_ID_WINBOND_82C105	0x0105
-#define PCI_DEVICE_ID_WINBOND_83C553	0x0565
-
-
-#define PCI_VENDOR_ID_PLX		0x10b5
-#define PCI_DEVICE_ID_PLX_R685		0x1030
-#define PCI_DEVICE_ID_PLX_ROMULUS	0x106a
-#define PCI_DEVICE_ID_PLX_SPCOM800	0x1076
-#define PCI_DEVICE_ID_PLX_1077		0x1077
-#define PCI_DEVICE_ID_PLX_SPCOM200	0x1103
-#define PCI_DEVICE_ID_PLX_DJINN_ITOO	0x1151
-#define PCI_DEVICE_ID_PLX_R753		0x1152
-#define PCI_DEVICE_ID_PLX_OLITEC	0x1187
-#define PCI_DEVICE_ID_PLX_9050		0x9050
-#define PCI_DEVICE_ID_PLX_9080		0x9080
-#define PCI_DEVICE_ID_PLX_GTEK_SERIAL2	0xa001
-
-#define PCI_VENDOR_ID_MADGE		0x10b6
-#define PCI_DEVICE_ID_MADGE_MK2		0x0002
-
-#define PCI_VENDOR_ID_3COM		0x10b7
-#define PCI_DEVICE_ID_3COM_3C985	0x0001
-#define PCI_DEVICE_ID_3COM_3C940	0x1700
-#define PCI_DEVICE_ID_3COM_3C339	0x3390
-#define PCI_DEVICE_ID_3COM_3C359	0x3590
-#define PCI_DEVICE_ID_3COM_3C940B	0x80eb
-#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
-#define PCI_DEVICE_ID_3COM_3CR990B	0x9904
-#define PCI_DEVICE_ID_3COM_3CR990_FX	0x9905
-#define PCI_DEVICE_ID_3COM_3CR990SVR95	0x9908
-#define PCI_DEVICE_ID_3COM_3CR990SVR97	0x9909
-#define PCI_DEVICE_ID_3COM_3CR990SVR	0x990a
-
-
-#define PCI_VENDOR_ID_AL		0x10b9
-#define PCI_DEVICE_ID_AL_M1533		0x1533
-#define PCI_DEVICE_ID_AL_M1535 		0x1535
-#define PCI_DEVICE_ID_AL_M1541		0x1541
-#define PCI_DEVICE_ID_AL_M1563		0x1563
-#define PCI_DEVICE_ID_AL_M1621		0x1621
-#define PCI_DEVICE_ID_AL_M1631		0x1631
-#define PCI_DEVICE_ID_AL_M1632		0x1632
-#define PCI_DEVICE_ID_AL_M1641		0x1641
-#define PCI_DEVICE_ID_AL_M1644		0x1644
-#define PCI_DEVICE_ID_AL_M1647		0x1647
-#define PCI_DEVICE_ID_AL_M1651		0x1651
-#define PCI_DEVICE_ID_AL_M1671		0x1671
-#define PCI_DEVICE_ID_AL_M1681		0x1681
-#define PCI_DEVICE_ID_AL_M1683		0x1683
-#define PCI_DEVICE_ID_AL_M1689		0x1689
-#define PCI_DEVICE_ID_AL_M5219		0x5219
-#define PCI_DEVICE_ID_AL_M5228		0x5228
-#define PCI_DEVICE_ID_AL_M5229		0x5229
-#define PCI_DEVICE_ID_AL_M5451		0x5451
-#define PCI_DEVICE_ID_AL_M7101		0x7101
-
-
-
-#define PCI_VENDOR_ID_NEOMAGIC		0x10c8
-#define PCI_DEVICE_ID_NEOMAGIC_NM256AV_AUDIO 0x8005
-#define PCI_DEVICE_ID_NEOMAGIC_NM256ZX_AUDIO 0x8006
+#define PCI_VENDOR_ID_WINBOND2			0x1050
+#define PCI_DEVICE_ID_WINBOND2_89C940F		0x5a5a
+#define PCI_DEVICE_ID_WINBOND2_6692		0x6692
+
+#define PCI_VENDOR_ID_ANIGMA			0x1051
+#define PCI_DEVICE_ID_ANIGMA_MC145575		0x0100
+
+#define PCI_VENDOR_ID_EFAR			0x1055
+#define PCI_DEVICE_ID_EFAR_SLC90E66_1		0x9130
+#define PCI_DEVICE_ID_EFAR_SLC90E66_3		0x9463
+
+#define PCI_VENDOR_ID_MOTOROLA			0x1057
+#define PCI_DEVICE_ID_MOTOROLA_MPC105		0x0001
+#define PCI_DEVICE_ID_MOTOROLA_MPC106		0x0002
+#define PCI_DEVICE_ID_MOTOROLA_MPC107		0x0004
+#define PCI_DEVICE_ID_MOTOROLA_RAVEN		0x4801
+#define PCI_DEVICE_ID_MOTOROLA_FALCON		0x4802
+#define PCI_DEVICE_ID_MOTOROLA_HAWK		0x4803
+#define PCI_DEVICE_ID_MOTOROLA_HARRIER		0x480b
+#define PCI_DEVICE_ID_MOTOROLA_MPC5200		0x5803
+
+#define PCI_VENDOR_ID_PROMISE			0x105a
+#define PCI_DEVICE_ID_PROMISE_20265		0x0d30
+#define PCI_DEVICE_ID_PROMISE_20267		0x4d30
+#define PCI_DEVICE_ID_PROMISE_20246		0x4d33
+#define PCI_DEVICE_ID_PROMISE_20262		0x4d38
+#define PCI_DEVICE_ID_PROMISE_20263		0x0D38
+#define PCI_DEVICE_ID_PROMISE_20268		0x4d68
+#define PCI_DEVICE_ID_PROMISE_20269		0x4d69
+#define PCI_DEVICE_ID_PROMISE_20270		0x6268
+#define PCI_DEVICE_ID_PROMISE_20271		0x6269
+#define PCI_DEVICE_ID_PROMISE_20275		0x1275
+#define PCI_DEVICE_ID_PROMISE_20276		0x5275
+#define PCI_DEVICE_ID_PROMISE_20277		0x7275
+
+#define PCI_VENDOR_ID_UMC			0x1060
+#define PCI_DEVICE_ID_UMC_UM8673F		0x0101
+#define PCI_DEVICE_ID_UMC_UM8886BF		0x673a
+#define PCI_DEVICE_ID_UMC_UM8886A		0x886a
+
+#define PCI_VENDOR_ID_MYLEX			0x1069
+#define PCI_DEVICE_ID_MYLEX_DAC960_P		0x0001
+#define PCI_DEVICE_ID_MYLEX_DAC960_PD		0x0002
+#define PCI_DEVICE_ID_MYLEX_DAC960_PG		0x0010
+#define PCI_DEVICE_ID_MYLEX_DAC960_LA		0x0020
+#define PCI_DEVICE_ID_MYLEX_DAC960_LP		0x0050
+#define PCI_DEVICE_ID_MYLEX_DAC960_BA		0xBA56
+#define PCI_DEVICE_ID_MYLEX_DAC960_GEM		0xB166
+
+#define PCI_VENDOR_ID_APPLE			0x106b
+#define PCI_DEVICE_ID_APPLE_BANDIT		0x0001
+#define PCI_DEVICE_ID_APPLE_HYDRA		0x000e
+#define PCI_DEVICE_ID_APPLE_UNI_N_FW		0x0018
+#define PCI_DEVICE_ID_APPLE_UNI_N_AGP		0x0020
+#define PCI_DEVICE_ID_APPLE_UNI_N_GMAC		0x0021
+#define PCI_DEVICE_ID_APPLE_UNI_N_GMACP		0x0024
+#define PCI_DEVICE_ID_APPLE_UNI_N_AGP_P		0x0027
+#define PCI_DEVICE_ID_APPLE_UNI_N_AGP15		0x002d
+#define PCI_DEVICE_ID_APPLE_UNI_N_PCI15		0x002e
+#define PCI_DEVICE_ID_APPLE_UNI_N_GMAC2		0x0032
+#define PCI_DEVICE_ID_APPLE_UNI_N_ATA		0x0033
+#define PCI_DEVICE_ID_APPLE_UNI_N_AGP2		0x0034
+#define PCI_DEVICE_ID_APPLE_IPID_ATA100		0x003b
+#define PCI_DEVICE_ID_APPLE_K2_ATA100		0x0043
+#define PCI_DEVICE_ID_APPLE_U3_AGP		0x004b
+#define PCI_DEVICE_ID_APPLE_K2_GMAC		0x004c
+#define PCI_DEVICE_ID_APPLE_SH_ATA		0x0050
+#define PCI_DEVICE_ID_APPLE_SH_SUNGEM		0x0051
+#define PCI_DEVICE_ID_APPLE_U3L_AGP		0x0058
+#define PCI_DEVICE_ID_APPLE_U3H_AGP		0x0059
+#define PCI_DEVICE_ID_APPLE_TIGON3		0x1645
+
+#define PCI_VENDOR_ID_YAMAHA			0x1073
+#define PCI_DEVICE_ID_YAMAHA_724		0x0004
+#define PCI_DEVICE_ID_YAMAHA_724F		0x000d
+#define PCI_DEVICE_ID_YAMAHA_740		0x000a
+#define PCI_DEVICE_ID_YAMAHA_740C		0x000c
+#define PCI_DEVICE_ID_YAMAHA_744		0x0010
+#define PCI_DEVICE_ID_YAMAHA_754		0x0012
+
+#define PCI_VENDOR_ID_QLOGIC			0x1077
+#define PCI_DEVICE_ID_QLOGIC_ISP1020		0x1020
+#define PCI_DEVICE_ID_QLOGIC_ISP2100		0x2100
+#define PCI_DEVICE_ID_QLOGIC_ISP2200		0x2200
+#define PCI_DEVICE_ID_QLOGIC_ISP2300		0x2300
+#define PCI_DEVICE_ID_QLOGIC_ISP2312		0x2312
+#define PCI_DEVICE_ID_QLOGIC_ISP2322		0x2322
+#define PCI_DEVICE_ID_QLOGIC_ISP6312		0x6312
+#define PCI_DEVICE_ID_QLOGIC_ISP6322		0x6322
+#define PCI_DEVICE_ID_QLOGIC_ISP2422		0x2422
+#define PCI_DEVICE_ID_QLOGIC_ISP2432		0x2432
+#define PCI_DEVICE_ID_QLOGIC_ISP2512		0x2512
+#define PCI_DEVICE_ID_QLOGIC_ISP2522		0x2522
+
+#define PCI_VENDOR_ID_CYRIX			0x1078
+#define PCI_DEVICE_ID_CYRIX_5510		0x0000
+#define PCI_DEVICE_ID_CYRIX_PCI_MASTER		0x0001
+#define PCI_DEVICE_ID_CYRIX_5520		0x0002
+#define PCI_DEVICE_ID_CYRIX_5530_LEGACY		0x0100
+#define PCI_DEVICE_ID_CYRIX_5530_IDE		0x0102
+#define PCI_DEVICE_ID_CYRIX_5530_AUDIO		0x0103
+#define PCI_DEVICE_ID_CYRIX_5530_VIDEO		0x0104
+
+#define PCI_VENDOR_ID_CONTAQ			0x1080
+#define PCI_DEVICE_ID_CONTAQ_82C693		0xc693
+
+#define PCI_VENDOR_ID_OLICOM			0x108d
+#define PCI_DEVICE_ID_OLICOM_OC2325		0x0012
+#define PCI_DEVICE_ID_OLICOM_OC2183		0x0013
+#define PCI_DEVICE_ID_OLICOM_OC2326		0x0014
+
+#define PCI_VENDOR_ID_SUN			0x108e
+#define PCI_DEVICE_ID_SUN_EBUS			0x1000
+#define PCI_DEVICE_ID_SUN_HAPPYMEAL		0x1001
+#define PCI_DEVICE_ID_SUN_RIO_EBUS		0x1100
+#define PCI_DEVICE_ID_SUN_RIO_GEM		0x1101
+#define PCI_DEVICE_ID_SUN_RIO_1394		0x1102
+#define PCI_DEVICE_ID_SUN_RIO_USB		0x1103
+#define PCI_DEVICE_ID_SUN_GEM			0x2bad
+#define PCI_DEVICE_ID_SUN_SIMBA			0x5000
+#define PCI_DEVICE_ID_SUN_PBM			0x8000
+#define PCI_DEVICE_ID_SUN_SCHIZO		0x8001
+#define PCI_DEVICE_ID_SUN_SABRE			0xa000
+#define PCI_DEVICE_ID_SUN_HUMMINGBIRD		0xa001
+#define PCI_DEVICE_ID_SUN_TOMATILLO		0xa801
+
+#define PCI_VENDOR_ID_CMD			0x1095
+#define PCI_DEVICE_ID_CMD_643			0x0643
+#define PCI_DEVICE_ID_CMD_646			0x0646
+#define PCI_DEVICE_ID_CMD_648			0x0648
+#define PCI_DEVICE_ID_CMD_649			0x0649
+
+#define PCI_DEVICE_ID_SII_680			0x0680
+#define PCI_DEVICE_ID_SII_3112			0x3112
+#define PCI_DEVICE_ID_SII_1210SA		0x0240
+
+#define PCI_VENDOR_ID_BROOKTREE			0x109e
+#define PCI_DEVICE_ID_BROOKTREE_878		0x0878
+#define PCI_DEVICE_ID_BROOKTREE_879		0x0879
+
+#define PCI_VENDOR_ID_SGI			0x10a9
+#define PCI_DEVICE_ID_SGI_IOC3			0x0003
+#define PCI_DEVICE_ID_SGI_IOC4			0x100a
+#define PCI_VENDOR_ID_SGI_LITHIUM		0x1002
+
+#define PCI_VENDOR_ID_WINBOND			0x10ad
+#define PCI_DEVICE_ID_WINBOND_82C105		0x0105
+#define PCI_DEVICE_ID_WINBOND_83C553		0x0565
+
+#define PCI_VENDOR_ID_PLX			0x10b5
+#define PCI_DEVICE_ID_PLX_R685			0x1030
+#define PCI_DEVICE_ID_PLX_ROMULUS		0x106a
+#define PCI_DEVICE_ID_PLX_SPCOM800		0x1076
+#define PCI_DEVICE_ID_PLX_1077			0x1077
+#define PCI_DEVICE_ID_PLX_SPCOM200		0x1103
+#define PCI_DEVICE_ID_PLX_DJINN_ITOO		0x1151
+#define PCI_DEVICE_ID_PLX_R753			0x1152
+#define PCI_DEVICE_ID_PLX_OLITEC		0x1187
+#define PCI_DEVICE_ID_PLX_9050			0x9050
+#define PCI_DEVICE_ID_PLX_9080			0x9080
+#define PCI_DEVICE_ID_PLX_GTEK_SERIAL2		0xa001
+
+#define PCI_VENDOR_ID_MADGE			0x10b6
+#define PCI_DEVICE_ID_MADGE_MK2			0x0002
+
+#define PCI_VENDOR_ID_3COM			0x10b7
+#define PCI_DEVICE_ID_3COM_3C985		0x0001
+#define PCI_DEVICE_ID_3COM_3C940		0x1700
+#define PCI_DEVICE_ID_3COM_3C339		0x3390
+#define PCI_DEVICE_ID_3COM_3C359		0x3590
+#define PCI_DEVICE_ID_3COM_3C940B		0x80eb
+#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
+#define PCI_DEVICE_ID_3COM_3CR990B		0x9904
+#define PCI_DEVICE_ID_3COM_3CR990_FX		0x9905
+#define PCI_DEVICE_ID_3COM_3CR990SVR95		0x9908
+#define PCI_DEVICE_ID_3COM_3CR990SVR97		0x9909
+#define PCI_DEVICE_ID_3COM_3CR990SVR		0x990a
+
+#define PCI_VENDOR_ID_AL			0x10b9
+#define PCI_DEVICE_ID_AL_M1533			0x1533
+#define PCI_DEVICE_ID_AL_M1535			0x1535
+#define PCI_DEVICE_ID_AL_M1541			0x1541
+#define PCI_DEVICE_ID_AL_M1563			0x1563
+#define PCI_DEVICE_ID_AL_M1621			0x1621
+#define PCI_DEVICE_ID_AL_M1631			0x1631
+#define PCI_DEVICE_ID_AL_M1632			0x1632
+#define PCI_DEVICE_ID_AL_M1641			0x1641
+#define PCI_DEVICE_ID_AL_M1644			0x1644
+#define PCI_DEVICE_ID_AL_M1647			0x1647
+#define PCI_DEVICE_ID_AL_M1651			0x1651
+#define PCI_DEVICE_ID_AL_M1671			0x1671
+#define PCI_DEVICE_ID_AL_M1681			0x1681
+#define PCI_DEVICE_ID_AL_M1683			0x1683
+#define PCI_DEVICE_ID_AL_M1689			0x1689
+#define PCI_DEVICE_ID_AL_M5219			0x5219
+#define PCI_DEVICE_ID_AL_M5228			0x5228
+#define PCI_DEVICE_ID_AL_M5229			0x5229
+#define PCI_DEVICE_ID_AL_M5451			0x5451
+#define PCI_DEVICE_ID_AL_M7101			0x7101
+
+#define PCI_VENDOR_ID_NEOMAGIC			0x10c8
+#define PCI_DEVICE_ID_NEOMAGIC_NM256AV_AUDIO	0x8005
+#define PCI_DEVICE_ID_NEOMAGIC_NM256ZX_AUDIO	0x8006
 #define PCI_DEVICE_ID_NEOMAGIC_NM256XL_PLUS_AUDIO 0x8016
 
+#define PCI_VENDOR_ID_TCONRAD			0x10da
+#define PCI_DEVICE_ID_TCONRAD_TOKENRING		0x0508
 
-#define PCI_VENDOR_ID_TCONRAD		0x10da
-#define PCI_DEVICE_ID_TCONRAD_TOKENRING	0x0508
-
-
-#define PCI_VENDOR_ID_NVIDIA			0x10de
-#define PCI_DEVICE_ID_NVIDIA_TNT		0x0020
-#define PCI_DEVICE_ID_NVIDIA_TNT2		0x0028
-#define PCI_DEVICE_ID_NVIDIA_UTNT2		0x0029
-#define PCI_DEVICE_ID_NVIDIA_TNT_UNKNOWN        0x002a
-#define PCI_DEVICE_ID_NVIDIA_VTNT2		0x002C
-#define PCI_DEVICE_ID_NVIDIA_UVTNT2		0x002D
-#define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP04_IDE	0x0035
-#define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP04_SATA	0x0036
-#define PCI_DEVICE_ID_NVIDIA_NVENET_10		0x0037
-#define PCI_DEVICE_ID_NVIDIA_NVENET_11		0x0038
-#define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP04_SATA2	0x003e
-#define PCI_DEVICE_ID_NVIDIA_GEFORCE_6800_ULTRA 0x0040
-#define PCI_DEVICE_ID_NVIDIA_GEFORCE_6800       0x0041
-#define PCI_DEVICE_ID_NVIDIA_GEFORCE_6800_LE    0x0042
-#define PCI_DEVICE_ID_NVIDIA_GEFORCE_6800_GT    0x0045
-#define PCI_DEVICE_ID_NVIDIA_QUADRO_FX_4000     0x004E
-#define PCI_DEVICE_ID_NVIDIA_NFORCE4_SMBUS	0x0052
-#define PCI_DEVICE_ID_NVIDIA_NFORCE_CK804_IDE	0x0053
-#define PCI_DEVICE_ID_NVIDIA_NFORCE_CK804_SATA	0x0054
-#define PCI_DEVICE_ID_NVIDIA_NFORCE_CK804_SATA2	0x0055
-#define PCI_DEVICE_ID_NVIDIA_NVENET_8		0x0056
-#define PCI_DEVICE_ID_NVIDIA_NVENET_9		0x0057
-#define PCI_DEVICE_ID_NVIDIA_CK804_AUDIO	0x0059
-#define PCI_DEVICE_ID_NVIDIA_NFORCE2_SMBUS	0x0064
-#define PCI_DEVICE_ID_NVIDIA_NFORCE2_IDE	0x0065
-#define PCI_DEVICE_ID_NVIDIA_NVENET_2		0x0066
-#define PCI_DEVICE_ID_NVIDIA_MCP2_MODEM		0x0069
-#define PCI_DEVICE_ID_NVIDIA_MCP2_AUDIO		0x006a
-#define PCI_DEVICE_ID_NVIDIA_NFORCE2S_SMBUS	0x0084
-#define PCI_DEVICE_ID_NVIDIA_NFORCE2S_IDE	0x0085
-#define PCI_DEVICE_ID_NVIDIA_NVENET_4		0x0086
-#define PCI_DEVICE_ID_NVIDIA_MCP2S_MODEM	0x0089
-#define PCI_DEVICE_ID_NVIDIA_CK8_AUDIO		0x008a
-#define PCI_DEVICE_ID_NVIDIA_NVENET_5		0x008c
-#define PCI_DEVICE_ID_NVIDIA_NFORCE2S_SATA	0x008e
-#define PCI_DEVICE_ID_NVIDIA_ITNT2		0x00A0
-#define PCI_DEVICE_ID_GEFORCE_6800A             0x00c1
-#define PCI_DEVICE_ID_GEFORCE_6800A_LE          0x00c2
-#define PCI_DEVICE_ID_GEFORCE_GO_6800           0x00c8
-#define PCI_DEVICE_ID_GEFORCE_GO_6800_ULTRA     0x00c9
-#define PCI_DEVICE_ID_QUADRO_FX_GO1400          0x00cc
-#define PCI_DEVICE_ID_QUADRO_FX_1400            0x00ce
-#define PCI_DEVICE_ID_NVIDIA_NFORCE3		0x00d1
-#define PCI_DEVICE_ID_NVIDIA_NFORCE3_SMBUS	0x00d4
-#define PCI_DEVICE_ID_NVIDIA_NFORCE3_IDE	0x00d5
-#define PCI_DEVICE_ID_NVIDIA_NVENET_3		0x00d6
-#define PCI_DEVICE_ID_NVIDIA_MCP3_MODEM		0x00d9
-#define PCI_DEVICE_ID_NVIDIA_MCP3_AUDIO		0x00da
-#define PCI_DEVICE_ID_NVIDIA_NVENET_7		0x00df
-#define PCI_DEVICE_ID_NVIDIA_NFORCE3S		0x00e1
-#define PCI_DEVICE_ID_NVIDIA_NFORCE3S_SATA	0x00e3
-#define PCI_DEVICE_ID_NVIDIA_NFORCE3S_SMBUS	0x00e4
-#define PCI_DEVICE_ID_NVIDIA_NFORCE3S_IDE	0x00e5
-#define PCI_DEVICE_ID_NVIDIA_NVENET_6		0x00e6
-#define PCI_DEVICE_ID_NVIDIA_CK8S_AUDIO		0x00ea
-#define PCI_DEVICE_ID_NVIDIA_NFORCE3S_SATA2	0x00ee
-#define PCI_DEVICE_ID_NVIDIA_GEFORCE_SDR	0x0100
-#define PCI_DEVICE_ID_NVIDIA_GEFORCE_DDR	0x0101
-#define PCI_DEVICE_ID_NVIDIA_QUADRO		0x0103
-#define PCI_DEVICE_ID_NVIDIA_GEFORCE2_MX	0x0110
-#define PCI_DEVICE_ID_NVIDIA_GEFORCE2_MX2	0x0111
-#define PCI_DEVICE_ID_NVIDIA_GEFORCE2_GO	0x0112
-#define PCI_DEVICE_ID_NVIDIA_QUADRO2_MXR	0x0113
-#define PCI_DEVICE_ID_NVIDIA_GEFORCE_6600_GT	0x0140
-#define PCI_DEVICE_ID_NVIDIA_GEFORCE_6600	0x0141
-#define PCI_DEVICE_ID_NVIDIA_GEFORCE_6610_XL	0x0145
-#define PCI_DEVICE_ID_NVIDIA_QUADRO_FX_540	0x014E
-#define PCI_DEVICE_ID_NVIDIA_GEFORCE_6200	0x014F
-#define PCI_DEVICE_ID_NVIDIA_GEFORCE2_GTS	0x0150
-#define PCI_DEVICE_ID_NVIDIA_GEFORCE2_GTS2	0x0151
-#define PCI_DEVICE_ID_NVIDIA_GEFORCE2_ULTRA	0x0152
-#define PCI_DEVICE_ID_NVIDIA_QUADRO2_PRO	0x0153
-#define PCI_DEVICE_ID_NVIDIA_GEFORCE_6200_TURBOCACHE 0x0161
-#define PCI_DEVICE_ID_NVIDIA_GEFORCE_GO_6200    0x0164
-#define PCI_DEVICE_ID_NVIDIA_GEFORCE_GO_6250    0x0166
-#define PCI_DEVICE_ID_NVIDIA_GEFORCE_GO_6200_1  0x0167
-#define PCI_DEVICE_ID_NVIDIA_GEFORCE_GO_6250_1  0x0168
-#define PCI_DEVICE_ID_NVIDIA_GEFORCE4_MX_460	0x0170
-#define PCI_DEVICE_ID_NVIDIA_GEFORCE4_MX_440	0x0171
-#define PCI_DEVICE_ID_NVIDIA_GEFORCE4_MX_420	0x0172
-#define PCI_DEVICE_ID_NVIDIA_GEFORCE4_MX_440_SE	0x0173
-#define PCI_DEVICE_ID_NVIDIA_GEFORCE4_440_GO	0x0174
-#define PCI_DEVICE_ID_NVIDIA_GEFORCE4_420_GO	0x0175
-#define PCI_DEVICE_ID_NVIDIA_GEFORCE4_420_GO_M32 0x0176
-#define PCI_DEVICE_ID_NVIDIA_GEFORCE4_460_GO    0x0177
-#define PCI_DEVICE_ID_NVIDIA_QUADRO4_500XGL	0x0178
-#define PCI_DEVICE_ID_NVIDIA_GEFORCE4_440_GO_M64 0x0179
-#define PCI_DEVICE_ID_NVIDIA_QUADRO4_200	0x017A
-#define PCI_DEVICE_ID_NVIDIA_QUADRO4_550XGL	0x017B
-#define PCI_DEVICE_ID_NVIDIA_QUADRO4_500_GOGL	0x017C
-#define PCI_DEVICE_ID_NVIDIA_GEFORCE4_410_GO_M16 0x017D
-#define PCI_DEVICE_ID_NVIDIA_GEFORCE4_MX_440_8X 0x0181
-#define PCI_DEVICE_ID_NVIDIA_GEFORCE4_MX_440SE_8X 0x0182
-#define PCI_DEVICE_ID_NVIDIA_GEFORCE4_MX_420_8X 0x0183
-#define PCI_DEVICE_ID_NVIDIA_GEFORCE4_448_GO    0x0186
-#define PCI_DEVICE_ID_NVIDIA_GEFORCE4_488_GO    0x0187
-#define PCI_DEVICE_ID_NVIDIA_QUADRO4_580_XGL    0x0188
-#define PCI_DEVICE_ID_NVIDIA_GEFORCE4_MX_MAC    0x0189
-#define PCI_DEVICE_ID_NVIDIA_QUADRO4_280_NVS    0x018A
-#define PCI_DEVICE_ID_NVIDIA_QUADRO4_380_XGL    0x018B
-#define PCI_DEVICE_ID_NVIDIA_IGEFORCE2		0x01a0
-#define PCI_DEVICE_ID_NVIDIA_NFORCE		0x01a4
-#define PCI_DEVICE_ID_NVIDIA_MCP1_AUDIO		0x01b1
-#define PCI_DEVICE_ID_NVIDIA_NFORCE_SMBUS	0x01b4
-#define PCI_DEVICE_ID_NVIDIA_NFORCE_IDE		0x01bc
-#define PCI_DEVICE_ID_NVIDIA_MCP1_MODEM		0x01c1
-#define PCI_DEVICE_ID_NVIDIA_NVENET_1		0x01c3
-#define PCI_DEVICE_ID_NVIDIA_NFORCE2		0x01e0
-#define PCI_DEVICE_ID_NVIDIA_GEFORCE3		0x0200
-#define PCI_DEVICE_ID_NVIDIA_GEFORCE3_1		0x0201
-#define PCI_DEVICE_ID_NVIDIA_GEFORCE3_2		0x0202
-#define PCI_DEVICE_ID_NVIDIA_QUADRO_DDC		0x0203
-#define PCI_DEVICE_ID_NVIDIA_GEFORCE_6800B      0x0211
-#define PCI_DEVICE_ID_NVIDIA_GEFORCE_6800B_LE   0x0212
-#define PCI_DEVICE_ID_NVIDIA_GEFORCE_6800B_GT   0x0215
-#define PCI_DEVICE_ID_NVIDIA_GEFORCE4_TI_4600	0x0250
-#define PCI_DEVICE_ID_NVIDIA_GEFORCE4_TI_4400	0x0251
-#define PCI_DEVICE_ID_NVIDIA_GEFORCE4_TI_4200	0x0253
-#define PCI_DEVICE_ID_NVIDIA_QUADRO4_900XGL	0x0258
-#define PCI_DEVICE_ID_NVIDIA_QUADRO4_750XGL	0x0259
-#define PCI_DEVICE_ID_NVIDIA_QUADRO4_700XGL	0x025B
-#define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP51_IDE	0x0265
-#define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP51_SATA	0x0266
-#define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP51_SATA2	0x0267
-#define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP55_IDE	0x036E
-#define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP55_SATA	0x037E
-#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
-#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
-#define PCI_DEVICE_ID_NVIDIA_GEFORCE4_4200_GO       0x0286
-#define PCI_DEVICE_ID_NVIDIA_QUADRO4_980_XGL        0x0288
-#define PCI_DEVICE_ID_NVIDIA_QUADRO4_780_XGL        0x0289
-#define PCI_DEVICE_ID_NVIDIA_QUADRO4_700_GOGL       0x028C
-#define PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_5800_ULTRA  0x0301
-#define PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_5800        0x0302
-#define PCI_DEVICE_ID_NVIDIA_QUADRO_FX_2000         0x0308
-#define PCI_DEVICE_ID_NVIDIA_QUADRO_FX_1000         0x0309
-#define PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_5600_ULTRA  0x0311
-#define PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_5600        0x0312
-#define PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_5600SE      0x0314
-#define PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_GO5600      0x031A
-#define PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_GO5650      0x031B
-#define PCI_DEVICE_ID_NVIDIA_QUADRO_FX_GO700        0x031C
-#define PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_5200        0x0320
-#define PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_5200_ULTRA  0x0321
-#define PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_5200_1      0x0322
-#define PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_5200SE      0x0323
-#define PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_GO5200      0x0324
-#define PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_GO5250      0x0325
-#define PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_5500        0x0326
-#define PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_5100        0x0327
-#define PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_GO5250_32   0x0328
-#define PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_GO_5200	    0x0329
-#define PCI_DEVICE_ID_NVIDIA_QUADRO_NVS_280_PCI     0x032A
-#define PCI_DEVICE_ID_NVIDIA_QUADRO_FX_500          0x032B
-#define PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_GO5300      0x032C
-#define PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_GO5100      0x032D
-#define PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_5900_ULTRA  0x0330
-#define PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_5900        0x0331
-#define PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_5900XT      0x0332
-#define PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_5950_ULTRA  0x0333
-#define PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_5900ZT      0x0334
-#define PCI_DEVICE_ID_NVIDIA_QUADRO_FX_3000         0x0338
-#define PCI_DEVICE_ID_NVIDIA_QUADRO_FX_700          0x033F
-#define PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_5700_ULTRA  0x0341
-#define PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_5700        0x0342
-#define PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_5700LE      0x0343
-#define PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_5700VE      0x0344
-#define PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_GO5700_1    0x0347
-#define PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_GO5700_2    0x0348
-#define PCI_DEVICE_ID_NVIDIA_QUADRO_FX_GO1000       0x034C
-#define PCI_DEVICE_ID_NVIDIA_QUADRO_FX_1100         0x034E
-#define PCI_DEVICE_ID_NVIDIA_NVENET_14              0x0372
-#define PCI_DEVICE_ID_NVIDIA_NVENET_15              0x0373
+#define PCI_VENDOR_ID_NVIDIA				0x10de
+#define PCI_DEVICE_ID_NVIDIA_TNT			0x0020
+#define PCI_DEVICE_ID_NVIDIA_TNT2			0x0028
+#define PCI_DEVICE_ID_NVIDIA_UTNT2			0x0029
+#define PCI_DEVICE_ID_NVIDIA_TNT_UNKNOWN		0x002a
+#define PCI_DEVICE_ID_NVIDIA_VTNT2			0x002C
+#define PCI_DEVICE_ID_NVIDIA_UVTNT2			0x002D
+#define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP04_IDE		0x0035
+#define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP04_SATA		0x0036
+#define PCI_DEVICE_ID_NVIDIA_NVENET_10			0x0037
+#define PCI_DEVICE_ID_NVIDIA_NVENET_11			0x0038
+#define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP04_SATA2		0x003e
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE_6800_ULTRA		0x0040
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE_6800		0x0041
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE_6800_LE		0x0042
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE_6800_GT		0x0045
+#define PCI_DEVICE_ID_NVIDIA_QUADRO_FX_4000		0x004E
+#define PCI_DEVICE_ID_NVIDIA_NFORCE4_SMBUS		0x0052
+#define PCI_DEVICE_ID_NVIDIA_NFORCE_CK804_IDE		0x0053
+#define PCI_DEVICE_ID_NVIDIA_NFORCE_CK804_SATA		0x0054
+#define PCI_DEVICE_ID_NVIDIA_NFORCE_CK804_SATA2		0x0055
+#define PCI_DEVICE_ID_NVIDIA_NVENET_8			0x0056
+#define PCI_DEVICE_ID_NVIDIA_NVENET_9			0x0057
+#define PCI_DEVICE_ID_NVIDIA_CK804_AUDIO		0x0059
+#define PCI_DEVICE_ID_NVIDIA_NFORCE2_SMBUS		0x0064
+#define PCI_DEVICE_ID_NVIDIA_NFORCE2_IDE		0x0065
+#define PCI_DEVICE_ID_NVIDIA_NVENET_2			0x0066
+#define PCI_DEVICE_ID_NVIDIA_MCP2_MODEM			0x0069
+#define PCI_DEVICE_ID_NVIDIA_MCP2_AUDIO			0x006a
+#define PCI_DEVICE_ID_NVIDIA_NFORCE2S_SMBUS		0x0084
+#define PCI_DEVICE_ID_NVIDIA_NFORCE2S_IDE		0x0085
+#define PCI_DEVICE_ID_NVIDIA_NVENET_4			0x0086
+#define PCI_DEVICE_ID_NVIDIA_MCP2S_MODEM		0x0089
+#define PCI_DEVICE_ID_NVIDIA_CK8_AUDIO			0x008a
+#define PCI_DEVICE_ID_NVIDIA_NVENET_5			0x008c
+#define PCI_DEVICE_ID_NVIDIA_NFORCE2S_SATA		0x008e
+#define PCI_DEVICE_ID_NVIDIA_ITNT2			0x00A0
+#define PCI_DEVICE_ID_GEFORCE_6800A			0x00c1
+#define PCI_DEVICE_ID_GEFORCE_6800A_LE			0x00c2
+#define PCI_DEVICE_ID_GEFORCE_GO_6800			0x00c8
+#define PCI_DEVICE_ID_GEFORCE_GO_6800_ULTRA		0x00c9
+#define PCI_DEVICE_ID_QUADRO_FX_GO1400			0x00cc
+#define PCI_DEVICE_ID_QUADRO_FX_1400			0x00ce
+#define PCI_DEVICE_ID_NVIDIA_NFORCE3			0x00d1
+#define PCI_DEVICE_ID_NVIDIA_NFORCE3_SMBUS		0x00d4
+#define PCI_DEVICE_ID_NVIDIA_NFORCE3_IDE		0x00d5
+#define PCI_DEVICE_ID_NVIDIA_NVENET_3			0x00d6
+#define PCI_DEVICE_ID_NVIDIA_MCP3_MODEM			0x00d9
+#define PCI_DEVICE_ID_NVIDIA_MCP3_AUDIO			0x00da
+#define PCI_DEVICE_ID_NVIDIA_NVENET_7			0x00df
+#define PCI_DEVICE_ID_NVIDIA_NFORCE3S			0x00e1
+#define PCI_DEVICE_ID_NVIDIA_NFORCE3S_SATA		0x00e3
+#define PCI_DEVICE_ID_NVIDIA_NFORCE3S_SMBUS		0x00e4
+#define PCI_DEVICE_ID_NVIDIA_NFORCE3S_IDE		0x00e5
+#define PCI_DEVICE_ID_NVIDIA_NVENET_6			0x00e6
+#define PCI_DEVICE_ID_NVIDIA_CK8S_AUDIO			0x00ea
+#define PCI_DEVICE_ID_NVIDIA_NFORCE3S_SATA2		0x00ee
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE_SDR		0x0100
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE_DDR		0x0101
+#define PCI_DEVICE_ID_NVIDIA_QUADRO			0x0103
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE2_MX		0x0110
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE2_MX2		0x0111
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE2_GO		0x0112
+#define PCI_DEVICE_ID_NVIDIA_QUADRO2_MXR		0x0113
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE_6600_GT		0x0140
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE_6600		0x0141
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE_6610_XL		0x0145
+#define PCI_DEVICE_ID_NVIDIA_QUADRO_FX_540		0x014E
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE_6200		0x014F
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE2_GTS		0x0150
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE2_GTS2		0x0151
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE2_ULTRA		0x0152
+#define PCI_DEVICE_ID_NVIDIA_QUADRO2_PRO		0x0153
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE_6200_TURBOCACHE	0x0161
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE_GO_6200		0x0164
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE_GO_6250		0x0166
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE_GO_6200_1		0x0167
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE_GO_6250_1		0x0168
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE4_MX_460		0x0170
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE4_MX_440		0x0171
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE4_MX_420		0x0172
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE4_MX_440_SE		0x0173
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE4_440_GO		0x0174
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE4_420_GO		0x0175
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE4_420_GO_M32	0x0176
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE4_460_GO		0x0177
+#define PCI_DEVICE_ID_NVIDIA_QUADRO4_500XGL		0x0178
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE4_440_GO_M64	0x0179
+#define PCI_DEVICE_ID_NVIDIA_QUADRO4_200		0x017A
+#define PCI_DEVICE_ID_NVIDIA_QUADRO4_550XGL		0x017B
+#define PCI_DEVICE_ID_NVIDIA_QUADRO4_500_GOGL		0x017C
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE4_410_GO_M16	0x017D
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE4_MX_440_8X		0x0181
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE4_MX_440SE_8X	0x0182
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE4_MX_420_8X		0x0183
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE4_448_GO		0x0186
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE4_488_GO		0x0187
+#define PCI_DEVICE_ID_NVIDIA_QUADRO4_580_XGL		0x0188
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE4_MX_MAC		0x0189
+#define PCI_DEVICE_ID_NVIDIA_QUADRO4_280_NVS		0x018A
+#define PCI_DEVICE_ID_NVIDIA_QUADRO4_380_XGL		0x018B
+#define PCI_DEVICE_ID_NVIDIA_IGEFORCE2			0x01a0
+#define PCI_DEVICE_ID_NVIDIA_NFORCE			0x01a4
+#define PCI_DEVICE_ID_NVIDIA_MCP1_AUDIO			0x01b1
+#define PCI_DEVICE_ID_NVIDIA_NFORCE_SMBUS		0x01b4
+#define PCI_DEVICE_ID_NVIDIA_NFORCE_IDE			0x01bc
+#define PCI_DEVICE_ID_NVIDIA_MCP1_MODEM			0x01c1
+#define PCI_DEVICE_ID_NVIDIA_NVENET_1			0x01c3
+#define PCI_DEVICE_ID_NVIDIA_NFORCE2			0x01e0
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE3			0x0200
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE3_1			0x0201
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE3_2			0x0202
+#define PCI_DEVICE_ID_NVIDIA_QUADRO_DDC			0x0203
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE_6800B		0x0211
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE_6800B_LE		0x0212
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE_6800B_GT		0x0215
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE4_TI_4600		0x0250
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE4_TI_4400		0x0251
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE4_TI_4200		0x0253
+#define PCI_DEVICE_ID_NVIDIA_QUADRO4_900XGL		0x0258
+#define PCI_DEVICE_ID_NVIDIA_QUADRO4_750XGL		0x0259
+#define PCI_DEVICE_ID_NVIDIA_QUADRO4_700XGL		0x025B
+#define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP51_IDE		0x0265
+#define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP51_SATA		0x0266
+#define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP51_SATA2		0x0267
+#define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP55_IDE		0x036E
+#define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP55_SATA		0x037E
+#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
+#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
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE4_4200_GO		0x0286
+#define PCI_DEVICE_ID_NVIDIA_QUADRO4_980_XGL		0x0288
+#define PCI_DEVICE_ID_NVIDIA_QUADRO4_780_XGL		0x0289
+#define PCI_DEVICE_ID_NVIDIA_QUADRO4_700_GOGL		0x028C
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_5800_ULTRA	0x0301
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_5800		0x0302
+#define PCI_DEVICE_ID_NVIDIA_QUADRO_FX_2000		0x0308
+#define PCI_DEVICE_ID_NVIDIA_QUADRO_FX_1000		0x0309
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_5600_ULTRA	0x0311
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_5600		0x0312
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_5600SE		0x0314
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_GO5600		0x031A
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_GO5650		0x031B
+#define PCI_DEVICE_ID_NVIDIA_QUADRO_FX_GO700		0x031C
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_5200		0x0320
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_5200_ULTRA	0x0321
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_5200_1		0x0322
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_5200SE		0x0323
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_GO5200		0x0324
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_GO5250		0x0325
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_5500		0x0326
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_5100		0x0327
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_GO5250_32	0x0328
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_GO_5200		0x0329
+#define PCI_DEVICE_ID_NVIDIA_QUADRO_NVS_280_PCI		0x032A
+#define PCI_DEVICE_ID_NVIDIA_QUADRO_FX_500		0x032B
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_GO5300		0x032C
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_GO5100		0x032D
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_5900_ULTRA	0x0330
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_5900		0x0331
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_5900XT		0x0332
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_5950_ULTRA	0x0333
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_5900ZT		0x0334
+#define PCI_DEVICE_ID_NVIDIA_QUADRO_FX_3000		0x0338
+#define PCI_DEVICE_ID_NVIDIA_QUADRO_FX_700		0x033F
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_5700_ULTRA	0x0341
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_5700		0x0342
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_5700LE		0x0343
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_5700VE		0x0344
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_GO5700_1	0x0347
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_GO5700_2	0x0348
+#define PCI_DEVICE_ID_NVIDIA_QUADRO_FX_GO1000		0x034C
+#define PCI_DEVICE_ID_NVIDIA_QUADRO_FX_1100		0x034E
+#define PCI_DEVICE_ID_NVIDIA_NVENET_14			0x0372
+#define PCI_DEVICE_ID_NVIDIA_NVENET_15			0x0373
 
 #define PCI_VENDOR_ID_IMS		0x10e0
 #define PCI_DEVICE_ID_IMS_TT128		0x9128
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[Index of Archives]     [Kernel Newbies]     [Netfilter]     [Bugtraq]     [Photo]     [Gimp]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Video 4 Linux]     [Linux for the blind]
  Powered by Linux