Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2de6c39f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 0b0e0b5f 4fa2eeea
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -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