diff --git a/[refs] b/[refs]
index 8174dd042fd0..2b6bdac76ee1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7cdad482974792419cfe4b0affca689170116f49
+refs/heads/master: 6842b9299272a9471a7e94e046b953f6ffe3db9d
diff --git a/trunk/arch/arm/kernel/dma.c b/trunk/arch/arm/kernel/dma.c
index 913fd947528c..3b325ef55a28 100644
--- a/trunk/arch/arm/kernel/dma.c
+++ b/trunk/arch/arm/kernel/dma.c
@@ -248,11 +248,14 @@ int get_dma_residue(dmach_t channel)
 	return ret;
 }
 
-void __init init_dma(void)
+static int __init init_dma(void)
 {
 	arch_dma_init(dma_chan);
+	return 0;
 }
 
+core_initcall(init_dma);
+
 #else
 
 int request_dma(dmach_t channel, const char *device_id)
@@ -276,7 +279,6 @@ GLOBAL_ALIAS(set_dma_count, get_dma_residue);
 GLOBAL_ALIAS(__set_dma_addr, get_dma_residue);
 GLOBAL_ALIAS(set_dma_sg, get_dma_residue);
 GLOBAL_ALIAS(set_dma_speed, get_dma_residue);
-GLOBAL_ALIAS(init_dma, get_dma_residue);
 
 #endif
 
diff --git a/trunk/arch/arm/kernel/irq.c b/trunk/arch/arm/kernel/irq.c
index d7099dbbb879..869c466e6258 100644
--- a/trunk/arch/arm/kernel/irq.c
+++ b/trunk/arch/arm/kernel/irq.c
@@ -1027,7 +1027,6 @@ void __init init_irq_proc(void)
 void __init init_IRQ(void)
 {
 	struct irqdesc *desc;
-	extern void init_dma(void);
 	int irq;
 
 #ifdef CONFIG_SMP
@@ -1041,7 +1040,6 @@ void __init init_IRQ(void)
 	}
 
 	init_arch_irq();
-	init_dma();
 }
 
 static int __init noirqdebug_setup(char *str)