diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2019-07-12 17:08:26 -0500 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2019-07-12 17:08:26 -0500 |
| commit | e09977285c1929867c9f251d28bda9aed78fe331 (patch) | |
| tree | dd08b4846d991c4bc9644cd23879b6bc86e6b461 /include/linux | |
| parent | 8cf80c5c14b4914b0eb03d4bcafebd07180edfb9 (diff) | |
| parent | b516ea586d717472178e6ef1c152e85608b0ce32 (diff) | |
Merge branch 'pci/misc'
- Generalize multi-function power dependency device links (Abhishek Sahu)
- Add NVIDIA GPU multi-function power dependencies (Abhishek Sahu)
- Optimize /proc/bus/pci/devices by using seq_puts() instead of
seq_printf() (Markus Elfring)
- Enable NVIDIA HDA controllers if BIOS didn't (Lukas Wunner)
* pci/misc:
PCI: Enable NVIDIA HDA controllers
PCI: Use seq_puts() instead of seq_printf() in show_device()
PCI: Add NVIDIA GPU multi-function power dependencies
PCI: Generalize multi-function power dependency device links
Diffstat (limited to 'include/linux')
| -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 70e86148cb1e..66898463b81f 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h @@ -1336,6 +1336,7 @@ #define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP78S_SMBUS 0x0752 #define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP77_IDE 0x0759 #define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP73_SMBUS 0x07D8 +#define PCI_DEVICE_ID_NVIDIA_GEFORCE_320M 0x08A0 #define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP79_SMBUS 0x0AA2 #define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP89_SATA 0x0D85 |