diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2021-07-06 18:56:22 +0300 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2021-07-06 18:56:22 +0300 |
| commit | 104eb9d8c97235d73220821ed3c12ee6450cfa7a (patch) | |
| tree | fba99dd855568171e5aea10c1cd9c154a31dede4 /include/linux | |
| parent | 6efb943b8616ec53a5e444193dccf1af9ad627b5 (diff) | |
| parent | 8fe55ef23387ce3c7488375b1fd539420d7654bb (diff) | |
| download | linux-104eb9d8c97235d73220821ed3c12ee6450cfa7a.tar.xz | |
Merge branch 'pci/enumeration'
- Add a debug message on PCI device release (Niklas Schnelle)
- Dynamically map ECAM regions to reduce vmalloc usage (Russell King)
* pci/enumeration:
PCI: Dynamically map ECAM regions
PCI: Print a debug message on PCI device release
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/pci-ecam.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/pci-ecam.h b/include/linux/pci-ecam.h index fbdadd4d8377..adea5a4771cf 100644 --- a/include/linux/pci-ecam.h +++ b/include/linux/pci-ecam.h @@ -55,6 +55,7 @@ struct pci_ecam_ops { struct pci_config_window { struct resource res; struct resource busr; + unsigned int bus_shift; void *priv; const struct pci_ecam_ops *ops; union { |