diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-05-28 23:54:52 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-05-28 23:54:52 -0400 |
| commit | 435462c6e639065460e91903d6bd2af0f5762fde (patch) | |
| tree | bf66ccdd613019035ebab535762366aa1026399b /include/linux/pci_ids.h | |
| parent | d7b41b1fdf162d3e26cb73bf2cf14816918e371e (diff) | |
| parent | b5c42bc8db17db80917f99205a03c51f17354495 (diff) | |
Merge branch 'merge' into next
Diffstat (limited to 'include/linux/pci_ids.h')
| -rw-r--r-- | include/linux/pci_ids.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index bfa0402d3434..b6ab381748c5 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h | |||
| @@ -1406,7 +1406,7 @@ | |||
| 1406 | #define PCI_DEVICE_ID_VIA_82C598_1 0x8598 | 1406 | #define PCI_DEVICE_ID_VIA_82C598_1 0x8598 |
| 1407 | #define PCI_DEVICE_ID_VIA_838X_1 0xB188 | 1407 | #define PCI_DEVICE_ID_VIA_838X_1 0xB188 |
| 1408 | #define PCI_DEVICE_ID_VIA_83_87XX_1 0xB198 | 1408 | #define PCI_DEVICE_ID_VIA_83_87XX_1 0xB198 |
| 1409 | #define PCI_DEVICE_ID_VIA_C409_IDE 0XC409 | 1409 | #define PCI_DEVICE_ID_VIA_VX855_IDE 0xC409 |
| 1410 | #define PCI_DEVICE_ID_VIA_ANON 0xFFFF | 1410 | #define PCI_DEVICE_ID_VIA_ANON 0xFFFF |
| 1411 | 1411 | ||
| 1412 | #define PCI_VENDOR_ID_SIEMENS 0x110A | 1412 | #define PCI_VENDOR_ID_SIEMENS 0x110A |