diff options
| author | Philippe Langlais <philippe.langlais@stericsson.com> | 2011-10-26 13:44:56 +0200 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-05-22 11:06:59 +0200 |
| commit | b1e221178aa2c7b4801902f330bfc5dfb7089c18 (patch) | |
| tree | 1eb90c91c58c40f347e2e2cb6781ad83e2b12b39 | |
| parent | 751eab27ef00d5058111f276f9b0ed2f959bfd89 (diff) | |
staging: nmf-cm: Fix after 3.1 rebase
Signed-off-by: Philippe Langlais <philippe.langlais@stericsson.com>
| -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); |