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/kernel/ioport.c | |
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/kernel/ioport.c')
-rw-r--r-- | arch/sparc/kernel/ioport.c | 11 |
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); | |||
427 | #endif /* CONFIG_SBUS */ | 427 | #endif /* CONFIG_SBUS */ |
428 | 428 | ||
429 | 429 | ||
430 | /* LEON reuses PCI DMA ops */ | ||
431 | #if defined(CONFIG_PCI) || defined(CONFIG_SPARC_LEON) | ||
432 | |||
433 | /* Allocate and map kernel buffer using consistent mode DMA for a device. | 430 | /* Allocate and map kernel buffer using consistent mode DMA for a device. |
434 | * hwdev should be valid struct pci_dev pointer for PCI devices. | 431 | * hwdev should be valid struct pci_dev pointer for PCI devices. |
435 | */ | 432 | */ |
@@ -657,13 +654,9 @@ struct dma_map_ops pci32_dma_ops = { | |||
657 | }; | 654 | }; |
658 | EXPORT_SYMBOL(pci32_dma_ops); | 655 | EXPORT_SYMBOL(pci32_dma_ops); |
659 | 656 | ||
660 | #endif /* CONFIG_PCI || CONFIG_SPARC_LEON */ | 657 | /* leon re-uses pci32_dma_ops */ |
661 | 658 | struct dma_map_ops *leon_dma_ops = &pci32_dma_ops; | |
662 | #ifdef CONFIG_SPARC_LEON | ||
663 | struct dma_map_ops *dma_ops = &pci32_dma_ops; | ||
664 | #elif defined(CONFIG_SBUS) | ||
665 | struct dma_map_ops *dma_ops = &sbus_dma_ops; | 659 | struct dma_map_ops *dma_ops = &sbus_dma_ops; |
666 | #endif | ||
667 | 660 | ||
668 | EXPORT_SYMBOL(dma_ops); | 661 | EXPORT_SYMBOL(dma_ops); |
669 | 662 | ||