diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-10-02 16:11:44 +1000 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-10-02 16:11:44 +1000 |
| commit | 9f5494b797eb334f3aba5894a0b5b34d332a3149 (patch) | |
| tree | 89dc8eddc1c35877c941ee07b33e1dc20e82a93b /arch/powerpc/include/asm/machdep.h | |
| parent | d2b194ed820880eb19c43b9c10d9f5f30026ee54 (diff) | |
| parent | b9579689ad3a208c342aed806afc7a9a808c4e1e (diff) | |
Merge commit 'kumar/kumar-dma'
Diffstat (limited to 'arch/powerpc/include/asm/machdep.h')
| -rw-r--r-- | arch/powerpc/include/asm/machdep.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/powerpc/include/asm/machdep.h b/arch/powerpc/include/asm/machdep.h index 893aafd87fd..2740c44ff71 100644 --- a/arch/powerpc/include/asm/machdep.h +++ b/arch/powerpc/include/asm/machdep.h @@ -88,8 +88,6 @@ struct machdep_calls { unsigned long (*tce_get)(struct iommu_table *tbl, long index); void (*tce_flush)(struct iommu_table *tbl); - void (*pci_dma_dev_setup)(struct pci_dev *dev); - void (*pci_dma_bus_setup)(struct pci_bus *bus); void __iomem * (*ioremap)(phys_addr_t addr, unsigned long size, unsigned long flags); @@ -101,6 +99,9 @@ struct machdep_calls { #endif #endif /* CONFIG_PPC64 */ + void (*pci_dma_dev_setup)(struct pci_dev *dev); + void (*pci_dma_bus_setup)(struct pci_bus *bus); + int (*probe)(void); void (*setup_arch)(void); /* Optional, may be NULL */ void (*init_early)(void); |