From 28b4c3f9fa97a64dc316652afeba8648718b87fb Mon Sep 17 00:00:00 2001
From: Philippe Langlais <philippe.langlais@stericsson.com>
Date: Wed, 26 Oct 2011 13:44:56 +0200
Subject: staging: nmf-cm: Fix after 3.1 rebase

Signed-off-by: Philippe Langlais <philippe.langlais@stericsson.com>
---
 drivers/staging/nmf-cm/cm_dma.c | 1 +
 drivers/staging/nmf-cm/cmld.c   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'drivers/staging')

diff --git a/drivers/staging/nmf-cm/cm_dma.c b/drivers/staging/nmf-cm/cm_dma.c
index c460728e6a0..d1c99d6af9a 100644
--- a/drivers/staging/nmf-cm/cm_dma.c
+++ b/drivers/staging/nmf-cm/cm_dma.c
@@ -7,6 +7,7 @@
 #include <linux/err.h>
 #include <linux/slab.h>
 #include <linux/dmaengine.h>
+#include <linux/dma-mapping.h>
 #include <asm/io.h>
 #include <mach/db8500-regs.h>
 
diff --git a/drivers/staging/nmf-cm/cmld.c b/drivers/staging/nmf-cm/cmld.c
index 9e26955d100..d735323c572 100644
--- a/drivers/staging/nmf-cm/cmld.c
+++ b/drivers/staging/nmf-cm/cmld.c
@@ -258,7 +258,7 @@ static int cmld_open(struct inode *inode, struct file *file)
 
 		/* Initialize wait_queue, lists and mutexes */
 		init_waitqueue_head(&channelPriv->waitq);
-		plist_head_init(&channelPriv->messageQueue, &channelPriv->bh_lock);
+		plist_head_init(&channelPriv->messageQueue);
 		INIT_LIST_HEAD(&channelPriv->skelList);
 		spin_lock_init(&channelPriv->bh_lock);
 		mutex_init(&channelPriv->msgQueueLock);
-- 
cgit v1.2.3