diff --git a/[refs] b/[refs] index 899b46e074c3..5ecd3ad16a75 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6b00c92c4b26428cd80e966380c07103556f7b14 +refs/heads/master: 57c651f74cd8383df10a648e677902849de1bc0b diff --git a/trunk/drivers/dma/ioatdma.h b/trunk/drivers/dma/ioatdma.h index 312353d12af2..a5d3b3644160 100644 --- a/trunk/drivers/dma/ioatdma.h +++ b/trunk/drivers/dma/ioatdma.h @@ -26,8 +26,7 @@ #include #include #include - -#define PCI_DEVICE_ID_INTEL_IOAT 0x1a38 +#include #define IOAT_LOW_COMPLETION_MASK 0xffffffc0 diff --git a/trunk/include/linux/pci_ids.h b/trunk/include/linux/pci_ids.h index 590dc6dca315..819c8e1324d1 100644 --- a/trunk/include/linux/pci_ids.h +++ b/trunk/include/linux/pci_ids.h @@ -2043,6 +2043,7 @@ #define PCI_DEVICE_ID_INTEL_80960_RP 0x1960 #define PCI_DEVICE_ID_INTEL_82840_HB 0x1a21 #define PCI_DEVICE_ID_INTEL_82845_HB 0x1a30 +#define PCI_DEVICE_ID_INTEL_IOAT 0x1a38 #define PCI_DEVICE_ID_INTEL_82801AA_0 0x2410 #define PCI_DEVICE_ID_INTEL_82801AA_1 0x2411 #define PCI_DEVICE_ID_INTEL_82801AA_3 0x2413