diff options
| author | Andreas Larsson <andreas@gaisler.com> | 2014-09-08 09:48:52 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-09-10 01:42:17 +0200 |
| commit | b84ca92e1672432aac43cccaaa572881e7cc9fdd (patch) | |
| tree | 72aa515100ecf819458f1899be4717780734f15c /arch/sparc/include | |
| parent | sparc: leon: Fix race condition between leon_cycles_offset and timer_interrupt (diff) | |
| download | linux-b84ca92e1672432aac43cccaaa572881e7cc9fdd.tar.xz linux-b84ca92e1672432aac43cccaaa572881e7cc9fdd.zip | |
sparc32, leon: Make leon_dma_ops avaiable when !CONFIG_PCI
The leon_dma_ops struct is needed for leon regardless of PCI configuration.
Signed-off-by: Andreas Larsson <andreas@gaisler.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc/include')
| -rw-r--r-- | arch/sparc/include/asm/dma-mapping.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/sparc/include/asm/dma-mapping.h b/arch/sparc/include/asm/dma-mapping.h index 1ee02710b2dc..5b1b52a04ad6 100644 --- a/arch/sparc/include/asm/dma-mapping.h +++ b/arch/sparc/include/asm/dma-mapping.h @@ -20,10 +20,12 @@ extern struct bus_type pci_bus_type; static inline struct dma_map_ops *get_dma_ops(struct device *dev) { -#if defined(CONFIG_SPARC32) && defined(CONFIG_PCI) +#ifdef CONFIG_SPARC_LEON if (sparc_cpu_model == sparc_leon) return leon_dma_ops; - else if (dev->bus == &pci_bus_type) +#endif +#if defined(CONFIG_SPARC32) && defined(CONFIG_PCI) + if (dev->bus == &pci_bus_type) return &pci32_dma_ops; #endif return dma_ops; |