tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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

Linus Torvalds 2de6c39f 0b0e0b5f

+1
unified split
+1
include/linux/pci_ids.h
··· 1213 1213 #define PCI_DEVICE_ID_NVIDIA_NVENET_21 0x0451 1214 1214 #define PCI_DEVICE_ID_NVIDIA_NVENET_22 0x0452 1215 1215 #define PCI_DEVICE_ID_NVIDIA_NVENET_23 0x0453 1216 + #define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP67_IDE 0x0560 1216 1217 1217 1218 #define PCI_VENDOR_ID_IMS 0x10e0 1218 1219 #define PCI_DEVICE_ID_IMS_TT128 0x9128