diff options
| author | James Morris <[email protected]> | 2018-09-04 11:35:54 -0700 | 
|---|---|---|
| committer | James Morris <[email protected]> | 2018-09-04 11:35:54 -0700 | 
| commit | e42f6f9be4f83c537aa81b4c6239ea94ff5b29ce (patch) | |
| tree | f956a5ea0e83fc6d0df3e64681e7bbc1f201f3ee /drivers/pci/controller/dwc/pci-keystone.c | |
| parent | 4408e300a67ab2ce2505087986a9fe922c800ffd (diff) | |
| parent | 57361846b52bc686112da6ca5368d11210796804 (diff) | |
Merge tag 'v4.19-rc2' into next-general
Sync to Linux 4.19-rc2 for downstream developers.
Diffstat (limited to 'drivers/pci/controller/dwc/pci-keystone.c')
| -rw-r--r-- | drivers/pci/controller/dwc/pci-keystone.c | 1 | 
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/pci/controller/dwc/pci-keystone.c b/drivers/pci/controller/dwc/pci-keystone.c index 3722a5f31e5e..e88bd221fffe 100644 --- a/drivers/pci/controller/dwc/pci-keystone.c +++ b/drivers/pci/controller/dwc/pci-keystone.c @@ -347,7 +347,6 @@ static int __init ks_add_pcie_port(struct keystone_pcie *ks_pcie,  		}  	} -	pp->root_bus_nr = -1;  	pp->ops = &keystone_pcie_host_ops;  	ret = ks_dw_pcie_host_init(ks_pcie, ks_pcie->msi_intc_np);  	if (ret) {  |