Pull release into acpica branch

1 files changed, 36 insertions, 0 deletions

diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index a213e999de31..ecc1fc1f0f04 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -181,6 +181,7 @@
 #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_FC949ES       0x0646
 #define PCI_DEVICE_ID_LSI_FC919X        0x0628
 #define PCI_DEVICE_ID_NCR_YELLOWFIN     0x0701
 #define PCI_DEVICE_ID_LSI_61C102        0x0901
@@ -377,6 +378,7 @@
 #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_ISA     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
@@ -500,6 +502,14 @@
 #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_DEVICE_ID_AMD_CS5536_ISA    0x2090
+#define PCI_DEVICE_ID_AMD_CS5536_FLASH  0x2091
+#define PCI_DEVICE_ID_AMD_CS5536_AUDIO  0x2093
+#define PCI_DEVICE_ID_AMD_CS5536_OHC    0x2094
+#define PCI_DEVICE_ID_AMD_CS5536_EHC    0x2095
+#define PCI_DEVICE_ID_AMD_CS5536_UDC    0x2096
+#define PCI_DEVICE_ID_AMD_CS5536_UOC    0x2097
+#define PCI_DEVICE_ID_AMD_CS5536_IDE    0x209A
 
 #define PCI_DEVICE_ID_AMD_CS5536_IDE    0x209A
 
@@ -1041,6 +1051,11 @@
 #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 PCIE_DEVICE_ID_NVIDIA_GEFORCE_6800_ALT1 0x00f0
+#define PCIE_DEVICE_ID_NVIDIA_GEFORCE_6600_ALT1 0x00f1
+#define PCIE_DEVICE_ID_NVIDIA_GEFORCE_6600_ALT2 0x00f2
+#define PCIE_DEVICE_ID_NVIDIA_GEFORCE_6200_ALT1 0x00f3
+#define PCIE_DEVICE_ID_NVIDIA_GEFORCE_6800_GT   0x00f9
 #define PCI_DEVICE_ID_NVIDIA_GEFORCE_SDR        0x0100
 #define PCI_DEVICE_ID_NVIDIA_GEFORCE_DDR        0x0101
 #define PCI_DEVICE_ID_NVIDIA_QUADRO             0x0103
@@ -1583,6 +1598,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
@@ -1960,6 +1992,7 @@
 #define PCI_VENDOR_ID_DCI               0x6666
 #define PCI_DEVICE_ID_DCI_PCCOM4        0x0001
 #define PCI_DEVICE_ID_DCI_PCCOM8        0x0002
+#define PCI_DEVICE_ID_DCI_PCCOM2        0x0004
 
 #define PCI_VENDOR_ID_INTEL             0x8086
 #define PCI_DEVICE_ID_INTEL_EESSC       0x0008
@@ -2121,6 +2154,9 @@
 #define PCI_DEVICE_ID_INTEL_IXP2800     0x9004
 #define PCI_DEVICE_ID_INTEL_S21152BB    0xb152
 
+#define PCI_VENDOR_ID_SCALEMP           0x8686
+#define PCI_DEVICE_ID_SCALEMP_VSMP_CTL  0x1010
+
 #define PCI_VENDOR_ID_COMPUTONE         0x8e0e
 #define PCI_DEVICE_ID_COMPUTONE_IP2EX   0x0291
 #define PCI_DEVICE_ID_COMPUTONE_PG      0x0302