diff options
| author | David S. Miller <davem@davemloft.net> | 2009-03-26 18:23:24 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-03-26 18:23:24 -0400 |
| commit | 08abe18af1f78ee80c3c3a5ac47c3e0ae0beadf6 (patch) | |
| tree | 2be39bf8942edca1bcec735145e144a682ca9cd3 /include/linux/pci_ids.h | |
| parent | f0de70f8bb56952f6e016a65a8a8d006918f5bf6 (diff) | |
| parent | 0384e2959127a56d0640505d004d8dd92f9c29f5 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts:
drivers/net/wimax/i2400m/usb-notif.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 3f9687a71e32..097f410edefa 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h | |||
| @@ -2116,6 +2116,8 @@ | |||
| 2116 | #define PCI_DEVICE_ID_MELLANOX_SINAI_OLD 0x5e8c | 2116 | #define PCI_DEVICE_ID_MELLANOX_SINAI_OLD 0x5e8c |
| 2117 | #define PCI_DEVICE_ID_MELLANOX_SINAI 0x6274 | 2117 | #define PCI_DEVICE_ID_MELLANOX_SINAI 0x6274 |
| 2118 | 2118 | ||
| 2119 | #define PCI_VENDOR_ID_DFI 0x15bd | ||
| 2120 | |||
| 2119 | #define PCI_VENDOR_ID_QUICKNET 0x15e2 | 2121 | #define PCI_VENDOR_ID_QUICKNET 0x15e2 |
| 2120 | #define PCI_DEVICE_ID_QUICKNET_XJ 0x0500 | 2122 | #define PCI_DEVICE_ID_QUICKNET_XJ 0x0500 |
| 2121 | 2123 | ||