diff options
Diffstat (limited to 'arch/arm/mach-footbridge/dma.c')
-rw-r--r-- | arch/arm/mach-footbridge/dma.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/arch/arm/mach-footbridge/dma.c b/arch/arm/mach-footbridge/dma.c index 4f3506346969..e2e0df8bcee2 100644 --- a/arch/arm/mach-footbridge/dma.c +++ b/arch/arm/mach-footbridge/dma.c | |||
@@ -21,16 +21,16 @@ | |||
21 | #include <asm/hardware/dec21285.h> | 21 | #include <asm/hardware/dec21285.h> |
22 | 22 | ||
23 | #if 0 | 23 | #if 0 |
24 | static int fb_dma_request(dmach_t channel, dma_t *dma) | 24 | static int fb_dma_request(unsigned int chan, dma_t *dma) |
25 | { | 25 | { |
26 | return -EINVAL; | 26 | return -EINVAL; |
27 | } | 27 | } |
28 | 28 | ||
29 | static void fb_dma_enable(dmach_t channel, dma_t *dma) | 29 | static void fb_dma_enable(unsigned int chan, dma_t *dma) |
30 | { | 30 | { |
31 | } | 31 | } |
32 | 32 | ||
33 | static void fb_dma_disable(dmach_t channel, dma_t *dma) | 33 | static void fb_dma_disable(unsigned int chan, dma_t *dma) |
34 | { | 34 | { |
35 | } | 35 | } |
36 | 36 | ||
@@ -42,7 +42,7 @@ static struct dma_ops fb_dma_ops = { | |||
42 | }; | 42 | }; |
43 | #endif | 43 | #endif |
44 | 44 | ||
45 | void __init arch_dma_init(dma_t *dma) | 45 | static int __init fb_dma_init(void) |
46 | { | 46 | { |
47 | #if 0 | 47 | #if 0 |
48 | dma[_DC21285_DMA(0)].d_ops = &fb_dma_ops; | 48 | dma[_DC21285_DMA(0)].d_ops = &fb_dma_ops; |
@@ -50,6 +50,8 @@ void __init arch_dma_init(dma_t *dma) | |||
50 | #endif | 50 | #endif |
51 | #ifdef CONFIG_ISA_DMA | 51 | #ifdef CONFIG_ISA_DMA |
52 | if (footbridge_cfn_mode()) | 52 | if (footbridge_cfn_mode()) |
53 | isa_init_dma(dma + _ISA_DMA(0)); | 53 | isa_init_dma(); |
54 | #endif | 54 | #endif |
55 | return 0; | ||
55 | } | 56 | } |
57 | core_initcall(fb_dma_init); | ||