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/host/pci-host-generic.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/host/pci-host-generic.c')
| -rw-r--r-- | drivers/pci/host/pci-host-generic.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/pci/host/pci-host-generic.c b/drivers/pci/host/pci-host-generic.c index c05ea9d72f69..7d709a7e0aa8 100644 --- a/drivers/pci/host/pci-host-generic.c +++ b/drivers/pci/host/pci-host-generic.c | |||
| @@ -60,6 +60,7 @@ static struct platform_driver gen_pci_driver = { | |||
| 60 | .driver = { | 60 | .driver = { |
| 61 | .name = "pci-host-generic", | 61 | .name = "pci-host-generic", |
| 62 | .of_match_table = gen_pci_of_match, | 62 | .of_match_table = gen_pci_of_match, |
| 63 | .suppress_bind_attrs = true, | ||
| 63 | }, | 64 | }, |
| 64 | .probe = gen_pci_probe, | 65 | .probe = gen_pci_probe, |
| 65 | }; | 66 | }; |