diff options
author | Michael Ellerman <mpe@ellerman.id.au> | 2016-02-25 13:52:58 +0300 |
---|---|---|
committer | Michael Ellerman <mpe@ellerman.id.au> | 2016-02-25 13:52:58 +0300 |
commit | 2527083cb831024d22a03f68f54f6a46ecf5bf6c (patch) | |
tree | 41de92d988a4deccb2d5087a964a51682f155e99 /arch/powerpc/platforms/powernv/pci.h | |
parent | a4c3f909b4d9bb9430bf42ad583661df6dfa86c6 (diff) | |
parent | 9ab3ac233a8b4ffcc27c8475b83dee49fc46bc76 (diff) | |
download | linux-2527083cb831024d22a03f68f54f6a46ecf5bf6c.tar.xz |
Merge tag 'powerpc-4.5-4' into next
Pull in our current fixes from 4.5, in particular the "Fix Multi hit
ERAT" bug is causing folks some grief when testing next.
Diffstat (limited to 'arch/powerpc/platforms/powernv/pci.h')
-rw-r--r-- | arch/powerpc/platforms/powernv/pci.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/powerpc/platforms/powernv/pci.h b/arch/powerpc/platforms/powernv/pci.h index 32cae3d8e011..3f814f382b2e 100644 --- a/arch/powerpc/platforms/powernv/pci.h +++ b/arch/powerpc/platforms/powernv/pci.h @@ -232,6 +232,7 @@ extern void pnv_pci_reset_secondary_bus(struct pci_dev *dev); extern int pnv_eeh_phb_reset(struct pci_controller *hose, int option); extern void pnv_pci_dma_dev_setup(struct pci_dev *pdev); +extern void pnv_pci_dma_bus_setup(struct pci_bus *bus); extern int pnv_setup_msi_irqs(struct pci_dev *pdev, int nvec, int type); extern void pnv_teardown_msi_irqs(struct pci_dev *pdev); |