diff options
author | Bjorn Helgaas <bhelgaas@google.com> | 2013-08-26 15:40:34 -0600 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2013-08-26 15:40:34 -0600 |
commit | 07f2daad094bc9e9770143cd2d619de24d84bb3e (patch) | |
tree | 202f930177f85456a129cfb3f7b5abc9615d52a4 /include/linux/pci.h | |
parent | 1193725f543c92a77c73769bc2fbe48c53275f53 (diff) | |
parent | 5895af79158a55562753f7f05762f3bd766d32b9 (diff) | |
download | linux-stable-07f2daad094bc9e9770143cd2d619de24d84bb3e.tar.gz linux-stable-07f2daad094bc9e9770143cd2d619de24d84bb3e.tar.bz2 linux-stable-07f2daad094bc9e9770143cd2d619de24d84bb3e.zip |
Merge branch 'pci/yijing-mps-v8' into next
* pci/yijing-mps-v8:
PCI: Warn if unsafe MPS settings detected
PCI: Fix MPS peer-to-peer DMA comment syntax
PCI: Don't restrict MPS for slots below Root Ports
PCI: Simplify MPS test for Downstream Port
PCI: Remove unnecessary check for pcie_get_mps() failure
PCI: Simplify pcie_bus_configure_settings() interface
PCI: Drop "PCI-E" prefix from Max Payload Size message
Diffstat (limited to 'include/linux/pci.h')
-rw-r--r-- | include/linux/pci.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/pci.h b/include/linux/pci.h index 82d1c78d3d91..b3b716524be5 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -675,7 +675,7 @@ struct pci_driver { /* these external functions are only available when PCI support is enabled */ #ifdef CONFIG_PCI -void pcie_bus_configure_settings(struct pci_bus *bus, u8 smpss); +void pcie_bus_configure_settings(struct pci_bus *bus); enum pcie_bus_config_types { PCIE_BUS_TUNE_OFF, |