diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2006-01-04 16:51:51 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-01-04 16:51:51 +0100 |
| commit | 95ba9fb06be4a8714c98df6097eab1808c72fa98 (patch) | |
| tree | 84282965985a2616041fda08a1dc4286f5edb1dd /arch/arm | |
| parent | [ARM] Refine selection of ISA_DMA_API and generic dma.c code (diff) | |
| download | linux-95ba9fb06be4a8714c98df6097eab1808c72fa98.tar.xz linux-95ba9fb06be4a8714c98df6097eab1808c72fa98.zip | |
[ARM] Remove definition of MAX_DMA_CHANNELS to zero
Since we now only build arch/arm/kernel/dma.c on machine types
which set ISA_DMA_API, we don't need to define MAX_DMA_CHANNELS
to 0 to indicate this - this definition becomes superfluous.
Remove it.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/kernel/dma.c | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/arch/arm/kernel/dma.c b/arch/arm/kernel/dma.c index 3b325ef55a28..62c8966a8b77 100644 --- a/arch/arm/kernel/dma.c +++ b/arch/arm/kernel/dma.c @@ -22,8 +22,6 @@ DEFINE_SPINLOCK(dma_spin_lock); -#if MAX_DMA_CHANNELS > 0 - static dma_t dma_chan[MAX_DMA_CHANNELS]; /* @@ -256,32 +254,6 @@ static int __init init_dma(void) core_initcall(init_dma); -#else - -int request_dma(dmach_t channel, const char *device_id) -{ - return -EINVAL; -} - -int get_dma_residue(dmach_t channel) -{ - return 0; -} - -#define GLOBAL_ALIAS(_a,_b) asm (".set " #_a "," #_b "; .globl " #_a) -GLOBAL_ALIAS(disable_dma, get_dma_residue); -GLOBAL_ALIAS(enable_dma, get_dma_residue); -GLOBAL_ALIAS(free_dma, get_dma_residue); -GLOBAL_ALIAS(get_dma_list, get_dma_residue); -GLOBAL_ALIAS(set_dma_mode, get_dma_residue); -GLOBAL_ALIAS(set_dma_page, get_dma_residue); -GLOBAL_ALIAS(set_dma_count, get_dma_residue); -GLOBAL_ALIAS(__set_dma_addr, get_dma_residue); -GLOBAL_ALIAS(set_dma_sg, get_dma_residue); -GLOBAL_ALIAS(set_dma_speed, get_dma_residue); - -#endif - EXPORT_SYMBOL(request_dma); EXPORT_SYMBOL(free_dma); EXPORT_SYMBOL(enable_dma); |