summaryrefslogtreecommitdiffstats
path: root/arch/sparc/kernel
diff options
context:
space:
mode:
authorSam Ravnborg <sam@ravnborg.org>2012-05-26 15:56:03 +0200
committerDavid S. Miller <davem@davemloft.net>2012-05-27 23:52:53 -0700
commit87e677c4122e732dd1f7142ba7b2d4823576a199 (patch)
treece5f6494a1e2030518a8077ee3da48b670dc369f /arch/sparc/kernel
parent556626adf1dc1ee88183b7ba267912b87b063a57 (diff)
downloadblackbird-op-linux-87e677c4122e732dd1f7142ba7b2d4823576a199.tar.gz
blackbird-op-linux-87e677c4122e732dd1f7142ba7b2d4823576a199.zip
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/kernel')
-rw-r--r--arch/sparc/kernel/ioport.c11
1 files changed, 2 insertions, 9 deletions
diff --git a/arch/sparc/kernel/ioport.c b/arch/sparc/kernel/ioport.c
index a2846f5e32d8..8bc4db01af32 100644
--- a/arch/sparc/kernel/ioport.c
+++ b/arch/sparc/kernel/ioport.c
@@ -427,9 +427,6 @@ arch_initcall(sparc_register_ioport);
#endif /* CONFIG_SBUS */
-/* LEON reuses PCI DMA ops */
-#if defined(CONFIG_PCI) || defined(CONFIG_SPARC_LEON)
-
/* Allocate and map kernel buffer using consistent mode DMA for a device.
* hwdev should be valid struct pci_dev pointer for PCI devices.
*/
@@ -657,13 +654,9 @@ struct dma_map_ops pci32_dma_ops = {
};
EXPORT_SYMBOL(pci32_dma_ops);
-#endif /* CONFIG_PCI || CONFIG_SPARC_LEON */
-
-#ifdef CONFIG_SPARC_LEON
-struct dma_map_ops *dma_ops = &pci32_dma_ops;
-#elif defined(CONFIG_SBUS)
+/* leon re-uses pci32_dma_ops */
+struct dma_map_ops *leon_dma_ops = &pci32_dma_ops;
struct dma_map_ops *dma_ops = &sbus_dma_ops;
-#endif
EXPORT_SYMBOL(dma_ops);
OpenPOWER on IntegriCloud