diff options
author | Andreas Larsson <andreas@gaisler.com> | 2014-09-08 03:48:52 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-09-09 19:42:17 -0400 |
commit | b84ca92e1672432aac43cccaaa572881e7cc9fdd (patch) | |
tree | 72aa515100ecf819458f1899be4717780734f15c /arch/sparc/include | |
parent | 384859d2af8ead22c9e5a570a4ab89f1b563c8e5 (diff) |
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; | |||
20 | 20 | ||
21 | static inline struct dma_map_ops *get_dma_ops(struct device *dev) | 21 | static inline struct dma_map_ops *get_dma_ops(struct device *dev) |
22 | { | 22 | { |
23 | #if defined(CONFIG_SPARC32) && defined(CONFIG_PCI) | 23 | #ifdef CONFIG_SPARC_LEON |
24 | if (sparc_cpu_model == sparc_leon) | 24 | if (sparc_cpu_model == sparc_leon) |
25 | return leon_dma_ops; | 25 | return leon_dma_ops; |
26 | else if (dev->bus == &pci_bus_type) | 26 | #endif |
27 | #if defined(CONFIG_SPARC32) && defined(CONFIG_PCI) | ||
28 | if (dev->bus == &pci_bus_type) | ||
27 | return &pci32_dma_ops; | 29 | return &pci32_dma_ops; |
28 | #endif | 30 | #endif |
29 | return dma_ops; | 31 | return dma_ops; |