aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pci/dwc/pci-layerscape.c
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2017-04-28 11:38:13 -0400
committerBjorn Helgaas <bhelgaas@google.com>2017-04-28 11:38:13 -0400
commit3146c8f4de9b0858794a902f273aec13f168596e (patch)
treea98617d22761b5b620ac2af829e15f9afe6d00ea /drivers/pci/dwc/pci-layerscape.c
parentef1b5dad5a386885998d11eb45ca7fd183079965 (diff)
parenta5f40e8098fe6d983fdb3beb7b50a8067c136141 (diff)
Merge branch 'pci/remove' into next
* pci/remove: PCI: Don't allow unbinding host controllers that aren't prepared
Diffstat (limited to 'drivers/pci/dwc/pci-layerscape.c')
-rw-r--r--drivers/pci/dwc/pci-layerscape.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/pci/dwc/pci-layerscape.c b/drivers/pci/dwc/pci-layerscape.c
index 8f0ee0d8129c..27d638c4e134 100644
--- a/drivers/pci/dwc/pci-layerscape.c
+++ b/drivers/pci/dwc/pci-layerscape.c
@@ -305,6 +305,7 @@ static struct platform_driver ls_pcie_driver = {
305 .driver = { 305 .driver = {
306 .name = "layerscape-pcie", 306 .name = "layerscape-pcie",
307 .of_match_table = ls_pcie_of_match, 307 .of_match_table = ls_pcie_of_match,
308 .suppress_bind_attrs = true,
308 }, 309 },
309}; 310};
310builtin_platform_driver_probe(ls_pcie_driver, ls_pcie_probe); 311builtin_platform_driver_probe(ls_pcie_driver, ls_pcie_probe);