Merge branch 'dma' into devel

Conflicts:

	arch/arm/plat-mxc/dma-mx1-mx2.c

1 files changed, 4 insertions, 2 deletions

diff --git a/arch/arm/mach-shark/dma.c b/arch/arm/mach-shark/dma.c
index 6774b8d5d13d..10b5b8b3272a 100644
--- 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);