From 94b4a94d79627e387006f581b3d458fd2081019b Mon Sep 17 00:00:00 2001
From: Haojian Zhuang <haojian.zhuang@marvell.com>
Date: Wed, 28 Apr 2010 15:24:24 -0400
Subject: [PATCH] --- yaml --- r: 191900 b: refs/heads/master c:
 f4557870834b15bcbe14a2fcd1a0338e9f9c89b5 h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/arch/arm/mach-mmp/mmp2.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 62269ef98fc1..8f2dc2c1ea30 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7f39403c56b01a8c023e8eb9ebe89007cdc4f4e6
+refs/heads/master: f4557870834b15bcbe14a2fcd1a0338e9f9c89b5
diff --git a/trunk/arch/arm/mach-mmp/mmp2.c b/trunk/arch/arm/mach-mmp/mmp2.c
index da5cd9d10807..7f5eb059bb01 100644
--- a/trunk/arch/arm/mach-mmp/mmp2.c
+++ b/trunk/arch/arm/mach-mmp/mmp2.c
@@ -22,6 +22,7 @@
 #include <mach/regs-apmu.h>
 #include <mach/cputype.h>
 #include <mach/irqs.h>
+#include <mach/dma.h>
 #include <mach/mfp.h>
 #include <mach/gpio.h>
 #include <mach/devices.h>
@@ -149,6 +150,7 @@ static int __init mmp2_init(void)
 #endif
 		mfp_init_base(MFPR_VIRT_BASE);
 		mfp_init_addr(mmp2_addr_map);
+		pxa_init_dma(IRQ_MMP2_DMA_RIQ, 16);
 		clkdev_add_table(ARRAY_AND_SIZE(mmp2_clkregs));
 	}