Merge /spare/repo/linux-2.6/
authorJeff Garzik <jgarzik@pobox.com>
Tue, 23 Aug 2005 05:07:10 +0000 (01:07 -0400)
committerJeff Garzik <jgarzik@pobox.com>
Tue, 23 Aug 2005 05:07:10 +0000 (01:07 -0400)
1  2 
include/linux/pci_ids.h

diff --combined include/linux/pci_ids.h
index 639291fe8ac0b1a8b9f86df9837e9ecb2cf8258e,927ed487630de4cf06ee698a63b7d88742942790..499a5325f67f75aca4ff64b6ae0f480e2e479344
  #define PCI_DEVICE_ID_APPLE_UNI_N_PCI15       0x002e
  #define PCI_DEVICE_ID_APPLE_UNI_N_FW2 0x0030
  #define PCI_DEVICE_ID_APPLE_UNI_N_GMAC2       0x0032
- #define PCI_DEVIEC_ID_APPLE_UNI_N_ATA 0x0033
+ #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_KEYLARGO_I        0x003e
  #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        0x036F
  #define PCI_DEVICE_ID_NVIDIA_NVENET_12                0x0268
  #define PCI_DEVICE_ID_NVIDIA_NVENET_13                0x0269
  #define PCI_DEVICE_ID_NVIDIA_MCP51_AUDIO      0x026B
  #define PCI_DEVICE_ID_SERVERWORKS_OSB4IDE 0x0211
  #define PCI_DEVICE_ID_SERVERWORKS_CSB5IDE 0x0212
  #define PCI_DEVICE_ID_SERVERWORKS_CSB6IDE 0x0213
+ #define PCI_DEVICE_ID_SERVERWORKS_HT1000IDE 0x0214
  #define PCI_DEVICE_ID_SERVERWORKS_CSB6IDE2 0x0217
  #define PCI_DEVICE_ID_SERVERWORKS_OSB4USB 0x0220
  #define PCI_DEVICE_ID_SERVERWORKS_CSB5USB PCI_DEVICE_ID_SERVERWORKS_OSB4USB
  #define PCI_VENDOR_ID_SIBYTE          0x166d
  #define PCI_DEVICE_ID_BCM1250_HT      0x0002
  
+ #define PCI_VENDOR_ID_NETCELL         0x169c
+ #define PCI_DEVICE_ID_REVOLUTION      0x0044
  #define PCI_VENDOR_ID_LINKSYS         0x1737
  #define PCI_DEVICE_ID_LINKSYS_EG1032  0x1032
  #define PCI_DEVICE_ID_LINKSYS_EG1064  0x1064
  #define PCI_VENDOR_ID_INTEL           0x8086
  #define PCI_DEVICE_ID_INTEL_EESSC     0x0008
  #define PCI_DEVICE_ID_INTEL_21145     0x0039
+ #define PCI_DEVICE_ID_INTEL_PXHD_0    0x0320
+ #define PCI_DEVICE_ID_INTEL_PXHD_1    0x0321
+ #define PCI_DEVICE_ID_INTEL_PXH_0     0x0329
+ #define PCI_DEVICE_ID_INTEL_PXH_1     0x032A
+ #define PCI_DEVICE_ID_INTEL_PXHV      0x032C
  #define PCI_DEVICE_ID_INTEL_82375     0x0482
  #define PCI_DEVICE_ID_INTEL_82424     0x0483
  #define PCI_DEVICE_ID_INTEL_82378     0x0484