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/pci.h | |
| parent | d2b194ed820880eb19c43b9c10d9f5f30026ee54 (diff) | |
| parent | b9579689ad3a208c342aed806afc7a9a808c4e1e (diff) | |
| download | talos-op-linux-9f5494b797eb334f3aba5894a0b5b34d332a3149.tar.gz talos-op-linux-9f5494b797eb334f3aba5894a0b5b34d332a3149.zip | |
Merge commit 'kumar/kumar-dma'
Diffstat (limited to 'arch/powerpc/include/asm/pci.h')
| -rw-r--r-- | arch/powerpc/include/asm/pci.h | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/arch/powerpc/include/asm/pci.h b/arch/powerpc/include/asm/pci.h index a05a942b1c25..0e52c7828ea4 100644 --- a/arch/powerpc/include/asm/pci.h +++ b/arch/powerpc/include/asm/pci.h @@ -60,6 +60,14 @@ static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel) return channel ? 15 : 14; } +#ifdef CONFIG_PCI +extern void set_pci_dma_ops(struct dma_mapping_ops *dma_ops); +extern struct dma_mapping_ops *get_pci_dma_ops(void); +#else /* CONFIG_PCI */ +#define set_pci_dma_ops(d) +#define get_pci_dma_ops() NULL +#endif + #ifdef CONFIG_PPC64 /* @@ -70,9 +78,6 @@ static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel) #define PCI_DISABLE_MWI #ifdef CONFIG_PCI -extern void set_pci_dma_ops(struct dma_mapping_ops *dma_ops); -extern struct dma_mapping_ops *get_pci_dma_ops(void); - static inline void pci_dma_burst_advice(struct pci_dev *pdev, enum pci_dma_burst_strategy *strat, unsigned long *strategy_parameter) @@ -89,9 +94,6 @@ static inline void pci_dma_burst_advice(struct pci_dev *pdev, *strat = PCI_DMA_BURST_MULTIPLE; *strategy_parameter = cacheline_size; } -#else /* CONFIG_PCI */ -#define set_pci_dma_ops(d) -#define get_pci_dma_ops() NULL #endif #else /* 32-bit */ |
