diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2006-10-21 11:46:04 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-10-21 11:46:04 -0400 |
| commit | 513b046c96cc2fbce730a3474f6f7ff0c4fdd05c (patch) | |
| tree | e8006368b6f643067486f92405a404757807d6da /include/linux/pci_ids.h | |
| parent | 82810b7b6cc7a74c68881a13b0eb66c7a6370fcc (diff) | |
| parent | c7a3bd177f248d01ee18a01d22048c80e071c331 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
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 f069df245469..f3a168f3c9df 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h | |||
| @@ -2351,3 +2351,5 @@ | |||
| 2351 | #define PCI_DEVICE_ID_RME_DIGI32_PRO 0x9897 | 2351 | #define PCI_DEVICE_ID_RME_DIGI32_PRO 0x9897 |
| 2352 | #define PCI_DEVICE_ID_RME_DIGI32_8 0x9898 | 2352 | #define PCI_DEVICE_ID_RME_DIGI32_8 0x9898 |
| 2353 | 2353 | ||
| 2354 | #define PCI_VENDOR_ID_QUICKNET 0x15E2 | ||
| 2355 | #define PCI_DEVICE_ID_QUICKNET_XJ 0x0500 | ||