History

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

Linus Torvalds committed 15 years ago

Commit 7f3bf7c2 parents cbc158d 21ef4b84 files · +26 −7Browse files

Showing the changes to include (1 of 4 files). Show all

Unified · Split

include/linux/pci_ids.h+10−0
@@ -2709,6 +2709,16 @@ · 2708 unmodified lines
27092709 #define PCI_DEVICE_ID_INTEL_ICH10_5 0x3a60
27102710 #define PCI_DEVICE_ID_INTEL_5_3400_SERIES_LPC_MIN 0x3b00
27112711 #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
27122722 #define PCI_DEVICE_ID_INTEL_IOAT_SNB 0x402f
27132723 #define PCI_DEVICE_ID_INTEL_5100_16 0x65f0
27142724 #define PCI_DEVICE_ID_INTEL_5100_21 0x65f5

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t