diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-04 22:43:43 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-04 22:43:43 -0400 |
| commit | 7f3bf7cd348cead84f8027b32aa30ea49fa64df5 (patch) | |
| tree | d2f68190c64a7598fff040a8895103031551e2f2 /include | |
| parent | cbc158d6bfa1990f7869717bb5270867c66068d1 (diff) | |
| parent | 21ef4b8b7a7d59a995bf44382de38c95587767d4 (diff) | |
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx
* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx:
dmaengine: use DEFINE_IDR for static initialization
ioat: fix xor_idx_to_desc
Avoid section type conflict in dma/ioat/dma_v3.c
ioat: Adding PCI IDs for IOAT devices on SandyBridge platforms
Diffstat (limited to 'include')
| -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 b00c4ec5056e..ae96bbe54518 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h | |||
| @@ -2709,6 +2709,16 @@ | |||
| 2709 | #define PCI_DEVICE_ID_INTEL_ICH10_5 0x3a60 | 2709 | #define PCI_DEVICE_ID_INTEL_ICH10_5 0x3a60 |
| 2710 | #define PCI_DEVICE_ID_INTEL_5_3400_SERIES_LPC_MIN 0x3b00 | 2710 | #define PCI_DEVICE_ID_INTEL_5_3400_SERIES_LPC_MIN 0x3b00 |
| 2711 | #define PCI_DEVICE_ID_INTEL_5_3400_SERIES_LPC_MAX 0x3b1f | 2711 | #define PCI_DEVICE_ID_INTEL_5_3400_SERIES_LPC_MAX 0x3b1f |
| 2712 | #define PCI_DEVICE_ID_INTEL_IOAT_SNB0 0x3c20 | ||
| 2713 | #define PCI_DEVICE_ID_INTEL_IOAT_SNB1 0x3c21 | ||
| 2714 | #define PCI_DEVICE_ID_INTEL_IOAT_SNB2 0x3c22 | ||
| 2715 | #define PCI_DEVICE_ID_INTEL_IOAT_SNB3 0x3c23 | ||
| 2716 | #define PCI_DEVICE_ID_INTEL_IOAT_SNB4 0x3c24 | ||
| 2717 | #define PCI_DEVICE_ID_INTEL_IOAT_SNB5 0x3c25 | ||
| 2718 | #define PCI_DEVICE_ID_INTEL_IOAT_SNB6 0x3c26 | ||
| 2719 | #define PCI_DEVICE_ID_INTEL_IOAT_SNB7 0x3c27 | ||
| 2720 | #define PCI_DEVICE_ID_INTEL_IOAT_SNB8 0x3c2e | ||
| 2721 | #define PCI_DEVICE_ID_INTEL_IOAT_SNB9 0x3c2f | ||
| 2712 | #define PCI_DEVICE_ID_INTEL_IOAT_SNB 0x402f | 2722 | #define PCI_DEVICE_ID_INTEL_IOAT_SNB 0x402f |
| 2713 | #define PCI_DEVICE_ID_INTEL_5100_16 0x65f0 | 2723 | #define PCI_DEVICE_ID_INTEL_5100_16 0x65f0 |
| 2714 | #define PCI_DEVICE_ID_INTEL_5100_21 0x65f5 | 2724 | #define PCI_DEVICE_ID_INTEL_5100_21 0x65f5 |