diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-03-23 19:36:09 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-03-23 19:36:09 -0400 |
| commit | e7bfbb0215ee9b2fc976f7f51e20a8ae02b1d839 (patch) | |
| tree | 469e5a5c9ce609e7109548a2f40d04528740d54b /include/linux/pci_ids.h | |
| parent | fe506d6bc5d7b9c0c1d630eecb32241c1d362462 (diff) | |
| parent | 9b6682ff4c69484b6955f89f7902e3dde2481bed (diff) | |
Merge branch 'topic/hda' into for-linus
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 aca8c458aa8a..02c18b903986 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h | |||
| @@ -2112,6 +2112,8 @@ | |||
| 2112 | #define PCI_DEVICE_ID_MELLANOX_SINAI_OLD 0x5e8c | 2112 | #define PCI_DEVICE_ID_MELLANOX_SINAI_OLD 0x5e8c |
| 2113 | #define PCI_DEVICE_ID_MELLANOX_SINAI 0x6274 | 2113 | #define PCI_DEVICE_ID_MELLANOX_SINAI 0x6274 |
| 2114 | 2114 | ||
| 2115 | #define PCI_VENDOR_ID_DFI 0x15bd | ||
| 2116 | |||
| 2115 | #define PCI_VENDOR_ID_QUICKNET 0x15e2 | 2117 | #define PCI_VENDOR_ID_QUICKNET 0x15e2 |
| 2116 | #define PCI_DEVICE_ID_QUICKNET_XJ 0x0500 | 2118 | #define PCI_DEVICE_ID_QUICKNET_XJ 0x0500 |
| 2117 | 2119 | ||