diff options
author | Philippe Langlais <philippe.langlais@stericsson.com> | 2011-10-26 13:44:56 +0200 |
---|---|---|
committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2011-12-06 11:00:49 +0100 |
commit | 28b4c3f9fa97a64dc316652afeba8648718b87fb (patch) | |
tree | ecf012bf4f8a99fec86c2f000303f9f03f19e126 /drivers/staging | |
parent | 7c8c38fb318041b29f540945ff0736b7a901e616 (diff) |
staging: nmf-cm: Fix after 3.1 rebase
Signed-off-by: Philippe Langlais <philippe.langlais@stericsson.com>
Diffstat (limited to 'drivers/staging')
-rw-r--r-- | drivers/staging/nmf-cm/cm_dma.c | 1 | ||||
-rw-r--r-- | drivers/staging/nmf-cm/cmld.c | 2 |
2 files changed, 2 insertions, 1 deletions
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); |