diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2009-09-08 20:55:54 -0400 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2009-09-08 20:55:54 -0400 |
| commit | 9134d02bc0af4a8747d448d1f811ec5f8eb96df6 (patch) | |
| tree | 704c3e5dcc10f360815c4868a74711f82fb62e27 /include/linux/pci_ids.h | |
| parent | bbb20089a3275a19e475dbc21320c3742e3ca423 (diff) | |
| parent | 80ffb3cceaefa405f2ecd46d66500ed8d53efe74 (diff) | |
Merge commit 'md/for-linus' into async-tx-next
Conflicts:
drivers/md/raid5.c
Diffstat (limited to 'include/linux/pci_ids.h')
| -rw-r--r-- | include/linux/pci_ids.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index bbeb13ceb8e8..d94d181e8a91 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h | |||
| @@ -2655,6 +2655,7 @@ | |||
| 2655 | #define PCI_DEVICE_ID_NETMOS_9835 0x9835 | 2655 | #define PCI_DEVICE_ID_NETMOS_9835 0x9835 |
| 2656 | #define PCI_DEVICE_ID_NETMOS_9845 0x9845 | 2656 | #define PCI_DEVICE_ID_NETMOS_9845 0x9845 |
| 2657 | #define PCI_DEVICE_ID_NETMOS_9855 0x9855 | 2657 | #define PCI_DEVICE_ID_NETMOS_9855 0x9855 |
| 2658 | #define PCI_DEVICE_ID_NETMOS_9901 0x9901 | ||
| 2658 | 2659 | ||
| 2659 | #define PCI_VENDOR_ID_3COM_2 0xa727 | 2660 | #define PCI_VENDOR_ID_3COM_2 0xa727 |
| 2660 | 2661 | ||