diff options
| author | Greg Kroah-Hartman | 2017-10-16 10:33:54 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2017-10-16 10:33:54 +0200 |
| commit | e4ed2b5370a2df2b1feeb970904d2f7761c241c9 (patch) | |
| tree | 852b17dcc8ed1ca8f35771e8f06d660bdfc51804 /drivers/pci/host/pci-aardvark.c | |
| parent | Merge 4.14-rc4 into usb-next (diff) | |
| parent | Linux 4.14-rc5 (diff) | |
| download | kernel-qcow2-linux-e4ed2b5370a2df2b1feeb970904d2f7761c241c9.tar.gz kernel-qcow2-linux-e4ed2b5370a2df2b1feeb970904d2f7761c241c9.tar.xz kernel-qcow2-linux-e4ed2b5370a2df2b1feeb970904d2f7761c241c9.zip | |
Merge 4.14-rc5 into usb-next
We want the USB fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/pci/host/pci-aardvark.c')
| -rw-r--r-- | drivers/pci/host/pci-aardvark.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/pci/host/pci-aardvark.c b/drivers/pci/host/pci-aardvark.c index 89f4e3d072d7..26ed0c08f209 100644 --- a/drivers/pci/host/pci-aardvark.c +++ b/drivers/pci/host/pci-aardvark.c @@ -935,6 +935,8 @@ static int advk_pcie_probe(struct platform_device *pdev) bridge->sysdata = pcie; bridge->busnr = 0; bridge->ops = &advk_pcie_ops; + bridge->map_irq = of_irq_parse_and_map_pci; + bridge->swizzle_irq = pci_common_swizzle; ret = pci_scan_root_bus_bridge(bridge); if (ret < 0) { |