diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2006-01-04 10:51:51 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-01-04 10:51:51 -0500 |
commit | 95ba9fb06be4a8714c98df6097eab1808c72fa98 (patch) | |
tree | 84282965985a2616041fda08a1dc4286f5edb1dd /arch | |
parent | 065909b91581cf2438d901a7811a82af3476bdab (diff) |
[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')
-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 @@ | |||
22 | 22 | ||
23 | DEFINE_SPINLOCK(dma_spin_lock); | 23 | DEFINE_SPINLOCK(dma_spin_lock); |
24 | 24 | ||
25 | #if MAX_DMA_CHANNELS > 0 | ||
26 | |||
27 | static dma_t dma_chan[MAX_DMA_CHANNELS]; | 25 | static dma_t dma_chan[MAX_DMA_CHANNELS]; |
28 | 26 | ||
29 | /* | 27 | /* |
@@ -256,32 +254,6 @@ static int __init init_dma(void) | |||
256 | 254 | ||
257 | core_initcall(init_dma); | 255 | core_initcall(init_dma); |
258 | 256 | ||
259 | #else | ||
260 | |||
261 | int request_dma(dmach_t channel, const char *device_id) | ||
262 | { | ||
263 | return -EINVAL; | ||
264 | } | ||
265 | |||
266 | int get_dma_residue(dmach_t channel) | ||
267 | { | ||
268 | return 0; | ||
269 | } | ||
270 | |||
271 | #define GLOBAL_ALIAS(_a,_b) asm (".set " #_a "," #_b "; .globl " #_a) | ||
272 | GLOBAL_ALIAS(disable_dma, get_dma_residue); | ||
273 | GLOBAL_ALIAS(enable_dma, get_dma_residue); | ||
274 | GLOBAL_ALIAS(free_dma, get_dma_residue); | ||
275 | GLOBAL_ALIAS(get_dma_list, get_dma_residue); | ||
276 | GLOBAL_ALIAS(set_dma_mode, get_dma_residue); | ||
277 | GLOBAL_ALIAS(set_dma_page, get_dma_residue); | ||
278 | GLOBAL_ALIAS(set_dma_count, get_dma_residue); | ||
279 | GLOBAL_ALIAS(__set_dma_addr, get_dma_residue); | ||
280 | GLOBAL_ALIAS(set_dma_sg, get_dma_residue); | ||
281 | GLOBAL_ALIAS(set_dma_speed, get_dma_residue); | ||
282 | |||
283 | #endif | ||
284 | |||
285 | EXPORT_SYMBOL(request_dma); | 257 | EXPORT_SYMBOL(request_dma); |
286 | EXPORT_SYMBOL(free_dma); | 258 | EXPORT_SYMBOL(free_dma); |
287 | EXPORT_SYMBOL(enable_dma); | 259 | EXPORT_SYMBOL(enable_dma); |