sparc32, leon: Make leon_dma_ops avaiable when !CONFIG_PCI
authorAndreas Larsson <andreas@gaisler.com>
Mon, 8 Sep 2014 07:48:52 +0000 (09:48 +0200)
committerDavid S. Miller <davem@davemloft.net>
Tue, 9 Sep 2014 23:42:17 +0000 (16:42 -0700)
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>
arch/sparc/include/asm/dma-mapping.h

index 1ee02710b2dc61b47c8a9494995bcf1e21287cce..5b1b52a04ad6283fb67308d9bf84b08494870140 100644 (file)
@@ -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;