diff options
author | David S. Miller <davem@davemloft.net> | 2009-05-19 00:08:20 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-05-19 00:08:20 -0400 |
commit | bb803cfbecb03a0cf8dc7e1864f18dda6631af00 (patch) | |
tree | 6c0989693bea6f50cfa5c6bb14f52ec19668def3 /include/linux/pci_ids.h | |
parent | 3878fb6fdbceecca20b15748f807340854220f06 (diff) | |
parent | 511e11e396dc596825ce04d53d7f6d579404bc01 (diff) |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/scsi/fcoe/fcoe.c
Diffstat (limited to 'include/linux/pci_ids.h')
-rw-r--r-- | include/linux/pci_ids.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index ea061e290d02..3038ac25491f 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h | |||
@@ -2516,6 +2516,8 @@ | |||
2516 | #define PCI_DEVICE_ID_INTEL_IOAT_TBG3 0x3433 | 2516 | #define PCI_DEVICE_ID_INTEL_IOAT_TBG3 0x3433 |
2517 | #define PCI_DEVICE_ID_INTEL_82830_HB 0x3575 | 2517 | #define PCI_DEVICE_ID_INTEL_82830_HB 0x3575 |
2518 | #define PCI_DEVICE_ID_INTEL_82830_CGC 0x3577 | 2518 | #define PCI_DEVICE_ID_INTEL_82830_CGC 0x3577 |
2519 | #define PCI_DEVICE_ID_INTEL_82854_HB 0x358c | ||
2520 | #define PCI_DEVICE_ID_INTEL_82854_IG 0x358e | ||
2519 | #define PCI_DEVICE_ID_INTEL_82855GM_HB 0x3580 | 2521 | #define PCI_DEVICE_ID_INTEL_82855GM_HB 0x3580 |
2520 | #define PCI_DEVICE_ID_INTEL_82855GM_IG 0x3582 | 2522 | #define PCI_DEVICE_ID_INTEL_82855GM_IG 0x3582 |
2521 | #define PCI_DEVICE_ID_INTEL_E7520_MCH 0x3590 | 2523 | #define PCI_DEVICE_ID_INTEL_E7520_MCH 0x3590 |