git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-shark
/
dma.c
diff --git
a/arch/arm/mach-shark/dma.c
b/arch/arm/mach-shark/dma.c
index 6774b8d5d13d696cbda2548198cd1834106c9dcd..10b5b8b3272a81b6bfd92068c625b72ed5174462 100644
(file)
--- a/
arch/arm/mach-shark/dma.c
+++ b/
arch/arm/mach-shark/dma.c
@@
-13,9
+13,11
@@
#include <asm/dma.h>
#include <asm/mach/dma.h>
-
void __init arch_dma_init(dma_t *dma
)
+
static int __init shark_dma_init(void
)
{
#ifdef CONFIG_ISA_DMA
- isa_init_dma(
dma
);
+ isa_init_dma();
#endif
+ return 0;
}
+core_initcall(shark_dma_init);