diff options
| author | Josh Boyer <jwboyer@fedoraproject.org> | 2014-11-24 08:25:40 -0500 |
|---|---|---|
| committer | Josh Boyer <jwboyer@fedoraproject.org> | 2014-11-24 08:25:40 -0500 |
| commit | 223ab06d1528b3f4e36275df0ec2fa7b2904f635 (patch) | |
| tree | 99d32581db2b99ab9e422a9f1f989293ce70c1cd /kernel-arm64.patch | |
| parent | 33fc8e2a5b2a9cde80a0e305ac09085585292e96 (diff) | |
| download | kernel-223ab06d1528b3f4e36275df0ec2fa7b2904f635.tar.gz kernel-223ab06d1528b3f4e36275df0ec2fa7b2904f635.tar.xz kernel-223ab06d1528b3f4e36275df0ec2fa7b2904f635.zip | |
Linux v3.18-rc6
Diffstat (limited to 'kernel-arm64.patch')
| -rw-r--r-- | kernel-arm64.patch | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/kernel-arm64.patch b/kernel-arm64.patch index d109fbbf3..6106d5b9c 100644 --- a/kernel-arm64.patch +++ b/kernel-arm64.patch @@ -11507,23 +11507,6 @@ index 9ecabfa..9029d59c 100644 static int xgene_pcie_probe_bridge(struct platform_device *pdev) { struct device_node *dn = pdev->dev.of_node; -@@ -631,10 +798,15 @@ static int xgene_pcie_probe_bridge(struct platform_device *pdev) - if (ret) - return ret; - -- bus = pci_scan_root_bus(&pdev->dev, 0, &xgene_pcie_ops, port, &res); -+ bus = pci_create_root_bus(&pdev->dev, 0, -+ &xgene_pcie_ops, port, &res); - if (!bus) - return -ENOMEM; - -+ pci_scan_child_bus(bus); -+ pci_assign_unassigned_bus_resources(bus); -+ pci_bus_add_devices(bus); -+ - platform_set_drvdata(pdev, port); - return 0; - } diff --git a/drivers/pnp/resource.c b/drivers/pnp/resource.c index 782e822..d952462 100644 --- a/drivers/pnp/resource.c |