diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
| commit | bcd6acd51f3d4d1ada201e9bc5c40a31d6d80c71 (patch) | |
| tree | 2f6dffd2d3e4dd67355a224de7e7a960335a92fd /include/linux/pci_ids.h | |
| parent | 11c34c7deaeeebcee342cbc35e1bb2a6711b2431 (diff) | |
| parent | 3ff6a468b45b5dfeb0e903e56f4eb27d34b2437c (diff) | |
Merge commit 'origin/master' into next
Conflicts:
include/linux/kvm.h
Diffstat (limited to 'include/linux/pci_ids.h')
| -rw-r--r-- | include/linux/pci_ids.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index 1b7f2a7939cb..4013b656ba7c 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h | |||
| @@ -1496,9 +1496,10 @@ | |||
| 1496 | #define PCI_DEVICE_ID_SBE_WANXL400 0x0104 | 1496 | #define PCI_DEVICE_ID_SBE_WANXL400 0x0104 |
| 1497 | 1497 | ||
| 1498 | #define PCI_VENDOR_ID_TOSHIBA 0x1179 | 1498 | #define PCI_VENDOR_ID_TOSHIBA 0x1179 |
| 1499 | #define PCI_DEVICE_ID_TOSHIBA_PICCOLO 0x0102 | 1499 | #define PCI_DEVICE_ID_TOSHIBA_PICCOLO_1 0x0101 |
| 1500 | #define PCI_DEVICE_ID_TOSHIBA_PICCOLO_1 0x0103 | 1500 | #define PCI_DEVICE_ID_TOSHIBA_PICCOLO_2 0x0102 |
| 1501 | #define PCI_DEVICE_ID_TOSHIBA_PICCOLO_2 0x0105 | 1501 | #define PCI_DEVICE_ID_TOSHIBA_PICCOLO_3 0x0103 |
| 1502 | #define PCI_DEVICE_ID_TOSHIBA_PICCOLO_5 0x0105 | ||
| 1502 | #define PCI_DEVICE_ID_TOSHIBA_TOPIC95 0x060a | 1503 | #define PCI_DEVICE_ID_TOSHIBA_TOPIC95 0x060a |
| 1503 | #define PCI_DEVICE_ID_TOSHIBA_TOPIC97 0x060f | 1504 | #define PCI_DEVICE_ID_TOSHIBA_TOPIC97 0x060f |
| 1504 | #define PCI_DEVICE_ID_TOSHIBA_TOPIC100 0x0617 | 1505 | #define PCI_DEVICE_ID_TOSHIBA_TOPIC100 0x0617 |
| @@ -1633,6 +1634,8 @@ | |||
| 1633 | #define PCI_DEVICE_ID_O2_6730 0x673a | 1634 | #define PCI_DEVICE_ID_O2_6730 0x673a |
| 1634 | #define PCI_DEVICE_ID_O2_6832 0x6832 | 1635 | #define PCI_DEVICE_ID_O2_6832 0x6832 |
| 1635 | #define PCI_DEVICE_ID_O2_6836 0x6836 | 1636 | #define PCI_DEVICE_ID_O2_6836 0x6836 |
| 1637 | #define PCI_DEVICE_ID_O2_6812 0x6872 | ||
| 1638 | #define PCI_DEVICE_ID_O2_6933 0x6933 | ||
| 1636 | 1639 | ||
| 1637 | #define PCI_VENDOR_ID_3DFX 0x121a | 1640 | #define PCI_VENDOR_ID_3DFX 0x121a |
| 1638 | #define PCI_DEVICE_ID_3DFX_VOODOO 0x0001 | 1641 | #define PCI_DEVICE_ID_3DFX_VOODOO 0x0001 |