diff options
author | Sam Ravnborg <sam@ravnborg.org> | 2012-05-26 09:56:03 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-05-28 02:52:53 -0400 |
commit | 87e677c4122e732dd1f7142ba7b2d4823576a199 (patch) | |
tree | ce5f6494a1e2030518a8077ee3da48b670dc369f /arch/sparc/include | |
parent | 556626adf1dc1ee88183b7ba267912b87b063a57 (diff) |
sparc32,leon: always support leon in ioport
Unconditially define pci32_dma_ops as this is used
for leon.
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Cc: Daniel Hellstrom <daniel@gaisler.com>
Cc: Konrad Eisele <konrad@gaisler.com>
Diffstat (limited to 'arch/sparc/include')
-rw-r--r-- | arch/sparc/include/asm/dma-mapping.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/arch/sparc/include/asm/dma-mapping.h b/arch/sparc/include/asm/dma-mapping.h index 48a7c65731d2..8493fd3c7ba5 100644 --- a/arch/sparc/include/asm/dma-mapping.h +++ b/arch/sparc/include/asm/dma-mapping.h | |||
@@ -12,13 +12,18 @@ extern int dma_supported(struct device *dev, u64 mask); | |||
12 | #define dma_alloc_noncoherent(d, s, h, f) dma_alloc_coherent(d, s, h, f) | 12 | #define dma_alloc_noncoherent(d, s, h, f) dma_alloc_coherent(d, s, h, f) |
13 | #define dma_free_noncoherent(d, s, v, h) dma_free_coherent(d, s, v, h) | 13 | #define dma_free_noncoherent(d, s, v, h) dma_free_coherent(d, s, v, h) |
14 | 14 | ||
15 | extern struct dma_map_ops *dma_ops, pci32_dma_ops; | 15 | extern struct dma_map_ops *dma_ops; |
16 | extern struct dma_map_ops *leon_dma_ops; | ||
17 | extern struct dma_map_ops pci32_dma_ops; | ||
18 | |||
16 | extern struct bus_type pci_bus_type; | 19 | extern struct bus_type pci_bus_type; |
17 | 20 | ||
18 | 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) |
19 | { | 22 | { |
20 | #if defined(CONFIG_SPARC32) && defined(CONFIG_PCI) | 23 | #if defined(CONFIG_SPARC32) && defined(CONFIG_PCI) |
21 | if (dev->bus == &pci_bus_type) | 24 | if (sparc_cpu_model == sparc_leon) |
25 | return leon_dma_ops; | ||
26 | else if (dev->bus == &pci_bus_type) | ||
22 | return &pci32_dma_ops; | 27 | return &pci32_dma_ops; |
23 | #endif | 28 | #endif |
24 | return dma_ops; | 29 | return dma_ops; |