git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/fs/xfs/xfs
[pandora-kernel.git]
/
arch
/
arm
/
mach-footbridge
/
dma.c
diff --git
a/arch/arm/mach-footbridge/dma.c
b/arch/arm/mach-footbridge/dma.c
index
4f35063
..
e2e0df8
100644
(file)
--- a/
arch/arm/mach-footbridge/dma.c
+++ b/
arch/arm/mach-footbridge/dma.c
@@
-21,16
+21,16
@@
#include <asm/hardware/dec21285.h>
#if 0
#include <asm/hardware/dec21285.h>
#if 0
-static int fb_dma_request(
dmach_t channel
, dma_t *dma)
+static int fb_dma_request(
unsigned int chan
, dma_t *dma)
{
return -EINVAL;
}
{
return -EINVAL;
}
-static void fb_dma_enable(
dmach_t channel
, dma_t *dma)
+static void fb_dma_enable(
unsigned int chan
, dma_t *dma)
{
}
{
}
-static void fb_dma_disable(
dmach_t channel
, dma_t *dma)
+static void fb_dma_disable(
unsigned int chan
, dma_t *dma)
{
}
{
}
@@
-42,7
+42,7
@@
static struct dma_ops fb_dma_ops = {
};
#endif
};
#endif
-
void __init arch_dma_init(dma_t *dma
)
+
static int __init fb_dma_init(void
)
{
#if 0
dma[_DC21285_DMA(0)].d_ops = &fb_dma_ops;
{
#if 0
dma[_DC21285_DMA(0)].d_ops = &fb_dma_ops;
@@
-50,6
+50,8
@@
void __init arch_dma_init(dma_t *dma)
#endif
#ifdef CONFIG_ISA_DMA
if (footbridge_cfn_mode())
#endif
#ifdef CONFIG_ISA_DMA
if (footbridge_cfn_mode())
- isa_init_dma(
dma + _ISA_DMA(0)
);
+ isa_init_dma();
#endif
#endif
+ return 0;
}
}
+core_initcall(fb_dma_init);