diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2017-04-28 11:38:13 -0400 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2017-04-28 11:38:13 -0400 |
| commit | 3146c8f4de9b0858794a902f273aec13f168596e (patch) | |
| tree | a98617d22761b5b620ac2af829e15f9afe6d00ea /drivers/pci/dwc/pci-imx6.c | |
| parent | ef1b5dad5a386885998d11eb45ca7fd183079965 (diff) | |
| parent | a5f40e8098fe6d983fdb3beb7b50a8067c136141 (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-imx6.c')
| -rw-r--r-- | drivers/pci/dwc/pci-imx6.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/pci/dwc/pci-imx6.c b/drivers/pci/dwc/pci-imx6.c index 129717ae5022..a98cba55c7f0 100644 --- a/drivers/pci/dwc/pci-imx6.c +++ b/drivers/pci/dwc/pci-imx6.c | |||
| @@ -804,6 +804,7 @@ static struct platform_driver imx6_pcie_driver = { | |||
| 804 | .driver = { | 804 | .driver = { |
| 805 | .name = "imx6q-pcie", | 805 | .name = "imx6q-pcie", |
| 806 | .of_match_table = imx6_pcie_of_match, | 806 | .of_match_table = imx6_pcie_of_match, |
| 807 | .suppress_bind_attrs = true, | ||
| 807 | }, | 808 | }, |
| 808 | .probe = imx6_pcie_probe, | 809 | .probe = imx6_pcie_probe, |
| 809 | .shutdown = imx6_pcie_shutdown, | 810 | .shutdown = imx6_pcie_shutdown, |