diff options
| author | Linus Torvalds | 2006-11-03 02:23:13 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2006-11-03 02:23:13 +0100 |
| commit | 2de6c39f389f25442389c3ab0f2d9b50e3f4a77d (patch) | |
| tree | 03378c3de4e70285488f1571956d99b254748260 | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6 (diff) | |
| parent | pci_ids.h: Add NVIDIA PCI ID (diff) | |
| download | kernel-qcow2-linux-2de6c39f389f25442389c3ab0f2d9b50e3f4a77d.tar.gz kernel-qcow2-linux-2de6c39f389f25442389c3ab0f2d9b50e3f4a77d.tar.xz kernel-qcow2-linux-2de6c39f389f25442389c3ab0f2d9b50e3f4a77d.zip | |
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
pci_ids.h: Add NVIDIA PCI ID
| -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 f3a168f3c9df..fa4e1d799782 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h @@ -1213,6 +1213,7 @@ #define PCI_DEVICE_ID_NVIDIA_NVENET_21 0x0451 #define PCI_DEVICE_ID_NVIDIA_NVENET_22 0x0452 #define PCI_DEVICE_ID_NVIDIA_NVENET_23 0x0453 +#define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP67_IDE 0x0560 #define PCI_VENDOR_ID_IMS 0x10e0 #define PCI_DEVICE_ID_IMS_TT128 0x9128 |