Merge master.kernel.org:/home/rmk/linux-2.6-serial

diff --combined include/linux/pci_ids.h
index a213e999de3139c1555cee5aeee56dcc8f59215e,efb5d22f8c092a17c7164724c9c11e41fa31af40..c3caa93efb10209bd24c200c96a08d2d7ddcbf66
--- 1/include/linux/pci_ids.h
--- 2/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@@ -15,7 -15,6 +15,7 @@@
  #define PCI_CLASS_STORAGE_FLOPPY      0x0102
  #define PCI_CLASS_STORAGE_IPI         0x0103
  #define PCI_CLASS_STORAGE_RAID                0x0104
 +#define PCI_CLASS_STORAGE_SAS         0x0107
  #define PCI_CLASS_STORAGE_OTHER               0x0180
  
  #define PCI_BASE_CLASS_NETWORK                0x02
@@@ -377,10 -376,6 +377,10 @@@
  #define PCI_DEVICE_ID_NS_87560_USB    0x0012
  #define PCI_DEVICE_ID_NS_83815                0x0020
  #define PCI_DEVICE_ID_NS_83820                0x0022
 +#define PCI_DEVICE_ID_NS_CS5535_IDE   0x002d
 +#define PCI_DEVICE_ID_NS_CS5535_AUDIO 0x002e
 +#define PCI_DEVICE_ID_NS_CS5535_USB   0x002f
 +#define PCI_DEVICE_ID_NS_CS5535_VIDEO 0x0030
  #define PCI_DEVICE_ID_NS_SATURN               0x0035
  #define PCI_DEVICE_ID_NS_SCx200_BRIDGE        0x0500
  #define PCI_DEVICE_ID_NS_SCx200_SMI   0x0501
@@@ -394,13 -389,6 +394,13 @@@
  #define PCI_DEVICE_ID_NS_87410                0xd001
  #define PCI_DEVICE_ID_NS_CS5535_IDE   0x002d
  
 +#define PCI_DEVICE_ID_NS_CS5535_HOST_BRIDGE  0x0028
 +#define PCI_DEVICE_ID_NS_CS5535_ISA_BRIDGE   0x002b
 +#define PCI_DEVICE_ID_NS_CS5535_IDE          0x002d
 +#define PCI_DEVICE_ID_NS_CS5535_AUDIO        0x002e
 +#define PCI_DEVICE_ID_NS_CS5535_USB          0x002f
 +#define PCI_DEVICE_ID_NS_CS5535_VIDEO        0x0030
 +
  #define PCI_VENDOR_ID_TSENG           0x100c
  #define PCI_DEVICE_ID_TSENG_W32P_2    0x3202
  #define PCI_DEVICE_ID_TSENG_W32P_b    0x3205
@@@ -503,9 -491,6 +503,9 @@@
  
  #define PCI_DEVICE_ID_AMD_CS5536_IDE  0x209A
  
 +#define PCI_DEVICE_ID_AMD_LX_VIDEO  0x2081
 +#define PCI_DEVICE_ID_AMD_LX_AES    0x2082
 +
  #define PCI_VENDOR_ID_TRIDENT         0x1023
  #define PCI_DEVICE_ID_TRIDENT_4DWAVE_DX       0x2000
  #define PCI_DEVICE_ID_TRIDENT_4DWAVE_NX       0x2001
@@@ -986,7 -971,6 +986,7 @@@
  #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_SMBUS       0x0034
  #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
@@@ -1583,6 -1567,23 +1583,23 @@@
  #define PCI_SUBDEVICE_ID_CONNECT_TECH_BH8_485_2_6     0x0009
  #define PCI_SUBDEVICE_ID_CONNECT_TECH_BH081101V1      0x000A
  #define PCI_SUBDEVICE_ID_CONNECT_TECH_BH041101V1      0x000B
+ #define PCI_SUBDEVICE_ID_CONNECT_TECH_BH2_20MHZ               0x000C
+ #define PCI_SUBDEVICE_ID_CONNECT_TECH_BH2_PTM         0x000D
+ #define PCI_SUBDEVICE_ID_CONNECT_TECH_NT960PCI                0x0100
+ #define PCI_SUBDEVICE_ID_CONNECT_TECH_TITAN_2         0x0201
+ #define PCI_SUBDEVICE_ID_CONNECT_TECH_TITAN_4         0x0202
+ #define PCI_SUBDEVICE_ID_CONNECT_TECH_PCI_UART_2_232  0x0300
+ #define PCI_SUBDEVICE_ID_CONNECT_TECH_PCI_UART_4_232  0x0301
+ #define PCI_SUBDEVICE_ID_CONNECT_TECH_PCI_UART_8_232  0x0302
+ #define PCI_SUBDEVICE_ID_CONNECT_TECH_PCI_UART_1_1    0x0310
+ #define PCI_SUBDEVICE_ID_CONNECT_TECH_PCI_UART_2_2    0x0311
+ #define PCI_SUBDEVICE_ID_CONNECT_TECH_PCI_UART_4_4    0x0312
+ #define PCI_SUBDEVICE_ID_CONNECT_TECH_PCI_UART_2      0x0320
+ #define PCI_SUBDEVICE_ID_CONNECT_TECH_PCI_UART_4      0x0321
+ #define PCI_SUBDEVICE_ID_CONNECT_TECH_PCI_UART_8      0x0322
+ #define PCI_SUBDEVICE_ID_CONNECT_TECH_PCI_UART_2_485  0x0330
+ #define PCI_SUBDEVICE_ID_CONNECT_TECH_PCI_UART_4_485  0x0331
+ #define PCI_SUBDEVICE_ID_CONNECT_TECH_PCI_UART_8_485  0x0332
  
  
  #define PCI_VENDOR_ID_NVIDIA_SGS      0x12d2