diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2016-10-03 09:43:19 -0500 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2016-10-03 09:43:19 -0500 |
| commit | 64ea3b99d665d0140cdf5047571e65d8ca28d0e6 (patch) | |
| tree | 59bf503a1a14b88eae8ebe6793cd685eb187be6c /include/linux/pci.h | |
| parent | fb6b6cc41bed72cbafb0d01ab139a4a5ad673e01 (diff) | |
| parent | 3161832d58c7f3bf8b190a2887086be0932d8dd3 (diff) | |
Merge branch 'pci/hotplug' into next
* pci/hotplug:
x86/PCI: VMD: Request userspace control of PCIe hotplug indicators
PCI: pciehp: Allow exclusive userspace control of indicators
PCI: pciehp: Remove useless pciehp_get_latch_status() calls
PCI: pciehp: Clean up dmesg "Slot(%s)" messages
PCI: pciehp: Remove unnecessary guard
PCI: pciehp: Don't re-read Slot Status when handling surprise event
PCI: pciehp: Don't re-read Slot Status when queuing hotplug event
PCI: pciehp: Process all hotplug events before looking for new ones
PCI: pciehp: Return IRQ_NONE when we can't read interrupt status
PCI: pciehp: Rename pcie_isr() locals for clarity
PCI: pciehp: Clear attention LED on device add
Diffstat (limited to 'include/linux/pci.h')
| -rw-r--r-- | include/linux/pci.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/pci.h b/include/linux/pci.h index 84d222ad3c08..b0e4ed19b315 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -312,6 +312,9 @@ struct pci_dev { powered on/off by the corresponding bridge */ unsigned int ignore_hotplug:1; /* Ignore hotplug events */ + unsigned int hotplug_user_indicators:1; /* SlotCtl indicators + controlled exclusively by + user sysfs */ unsigned int d3_delay; /* D3->D0 transition time in ms */ unsigned int d3cold_delay; /* D3cold->D0 transition time in ms */ |