diff options
| author | NeilBrown <neilb@suse.de> | 2009-09-23 04:31:11 -0400 |
|---|---|---|
| committer | NeilBrown <neilb@suse.de> | 2009-09-23 04:31:11 -0400 |
| commit | 4b3df5668c8ebaebd8d66a5a94374be3e3b2ef0c (patch) | |
| tree | 51a231742e211143f5845edf4b09d1712dcd2771 /include/linux/pci_ids.h | |
| parent | 1ef04fefe2241087d9db7e9615c3f11b516e36cf (diff) | |
| parent | 1f6672d44c1ae7408b43c06170ec34eb0a0e9b9f (diff) | |
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx into for-linus
Diffstat (limited to 'include/linux/pci_ids.h')
| -rw-r--r-- | include/linux/pci_ids.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index 3b6b788fe2b5..6f9623710f28 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h | |||
| @@ -2526,6 +2526,16 @@ | |||
| 2526 | #define PCI_DEVICE_ID_INTEL_E7525_MCH 0x359e | 2526 | #define PCI_DEVICE_ID_INTEL_E7525_MCH 0x359e |
| 2527 | #define PCI_DEVICE_ID_INTEL_IOAT_CNB 0x360b | 2527 | #define PCI_DEVICE_ID_INTEL_IOAT_CNB 0x360b |
| 2528 | #define PCI_DEVICE_ID_INTEL_FBD_CNB 0x360c | 2528 | #define PCI_DEVICE_ID_INTEL_FBD_CNB 0x360c |
| 2529 | #define PCI_DEVICE_ID_INTEL_IOAT_JSF0 0x3710 | ||
| 2530 | #define PCI_DEVICE_ID_INTEL_IOAT_JSF1 0x3711 | ||
| 2531 | #define PCI_DEVICE_ID_INTEL_IOAT_JSF2 0x3712 | ||
| 2532 | #define PCI_DEVICE_ID_INTEL_IOAT_JSF3 0x3713 | ||
| 2533 | #define PCI_DEVICE_ID_INTEL_IOAT_JSF4 0x3714 | ||
| 2534 | #define PCI_DEVICE_ID_INTEL_IOAT_JSF5 0x3715 | ||
| 2535 | #define PCI_DEVICE_ID_INTEL_IOAT_JSF6 0x3716 | ||
| 2536 | #define PCI_DEVICE_ID_INTEL_IOAT_JSF7 0x3717 | ||
| 2537 | #define PCI_DEVICE_ID_INTEL_IOAT_JSF8 0x3718 | ||
| 2538 | #define PCI_DEVICE_ID_INTEL_IOAT_JSF9 0x3719 | ||
| 2529 | #define PCI_DEVICE_ID_INTEL_ICH10_0 0x3a14 | 2539 | #define PCI_DEVICE_ID_INTEL_ICH10_0 0x3a14 |
| 2530 | #define PCI_DEVICE_ID_INTEL_ICH10_1 0x3a16 | 2540 | #define PCI_DEVICE_ID_INTEL_ICH10_1 0x3a16 |
| 2531 | #define PCI_DEVICE_ID_INTEL_ICH10_2 0x3a18 | 2541 | #define PCI_DEVICE_ID_INTEL_ICH10_2 0x3a18 |