Merge branch 'dma' into devel

Conflicts: arch/arm/plat-mxc/dma-mx1-mx2.c
2009-02-21 21:42:50 +00:00
parent 423145a5d4 fa4e998999
commit 22b61a11fd
13 changed files with 292 additions and 238 deletions
@@ -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);