diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-06 03:15:33 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-06 03:15:33 +0400 |
| commit | 2b03adc1911d1c84cb7fad8b424234f589547cb3 (patch) | |
| tree | ca817632d166046bbfe917894afd99c698d47627 /arch/microblaze/include/asm/pci.h | |
| parent | eb3d3ec567e868c8a3bfbfdfc9465ffd52983d11 (diff) | |
| parent | 225fba216261b0e24273f5f4eee504e3c7bd0255 (diff) | |
| download | linux-2b03adc1911d1c84cb7fad8b424234f589547cb3.tar.xz | |
Merge tag 'microblaze-3.16-rc1' of git://git.monstr.eu/linux-2.6-microblaze into next
Pull Microblaze updates from Michal Simek:
- cleanup PCI and DMA handling
- use generic device.h
- some cleanups
* tag 'microblaze-3.16-rc1' of git://git.monstr.eu/linux-2.6-microblaze:
microblaze: Fix typo in head.S s/substract/subtract/
microblaze: remove check for CONFIG_XILINX_CONSOLE
microblaze: Use generic device.h
microblaze: Do not setup empty unmap_sg function
microblaze: Remove device_to_mask
microblaze: Clean device dma_ops structure
microblaze: Cleanup PCI_DRAM_OFFSET handling
microblaze: Do not setup pci_dma_ops
microblaze: Return default dma operations
microblaze: Enable SERIAL_OF_PLATFORM
Diffstat (limited to 'arch/microblaze/include/asm/pci.h')
| -rw-r--r-- | arch/microblaze/include/asm/pci.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/arch/microblaze/include/asm/pci.h b/arch/microblaze/include/asm/pci.h index 335524040fff..468aca8cec0d 100644 --- a/arch/microblaze/include/asm/pci.h +++ b/arch/microblaze/include/asm/pci.h @@ -45,14 +45,6 @@ struct pci_dev; #define pcibios_assign_all_busses() 0 #ifdef CONFIG_PCI -extern void set_pci_dma_ops(struct dma_map_ops *dma_ops); -extern struct dma_map_ops *get_pci_dma_ops(void); -#else /* CONFIG_PCI */ -#define set_pci_dma_ops(d) -#define get_pci_dma_ops() NULL -#endif - -#ifdef CONFIG_PCI static inline void pci_dma_burst_advice(struct pci_dev *pdev, enum pci_dma_burst_strategy *strat, unsigned long *strategy_parameter) |