diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2015-04-10 09:27:18 -0400 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2015-04-10 09:27:18 -0400 |
| commit | 5468d5a64bf1e002e5081fa280186d0eba09fa0e (patch) | |
| tree | a9c1500d4b0cfb9db1f822dc1357c184b0f2f188 /include/linux/pci.h | |
| parent | 4dd1f57956ada782fd80b1c11c30a9595d6caafc (diff) | |
| parent | 55db3208f238ee776f1f747734051723d8a3c13e (diff) | |
Merge branch 'pci/misc' into next
* pci/misc:
PCI: Read capability list as dwords, not bytes
PCI: Don't clear ASPM bits when the FADT declares it's unsupported
PCI: Clarify policy for vendor IDs in pci.txt
PCI/ACPI: Optimize device state transition delays
PCI: Export pci_find_host_bridge() for use inside PCI core
PCI: Make a shareable UUID for PCI firmware ACPI _DSM
PCI: Fix typo in Thunderbolt kernel message
Diffstat (limited to 'include/linux/pci.h')
| -rw-r--r-- | include/linux/pci.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/pci.h b/include/linux/pci.h index a379513bddef..e63112fb55be 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h | |||
| @@ -406,6 +406,7 @@ struct pci_host_bridge { | |||
| 406 | struct list_head windows; /* resource_entry */ | 406 | struct list_head windows; /* resource_entry */ |
| 407 | void (*release_fn)(struct pci_host_bridge *); | 407 | void (*release_fn)(struct pci_host_bridge *); |
| 408 | void *release_data; | 408 | void *release_data; |
| 409 | unsigned int ignore_reset_delay:1; /* for entire hierarchy */ | ||
| 409 | }; | 410 | }; |
| 410 | 411 | ||
| 411 | #define to_pci_host_bridge(n) container_of(n, struct pci_host_bridge, dev) | 412 | #define to_pci_host_bridge(n) container_of(n, struct pci_host_bridge, dev) |