From: Vinod Koul <vinod.koul@linux.intel.com>
Date: Fri, 2 Sep 2011 11:13:44 +0000 (+0530)
Subject: Merge branch 'next' into v3.1-rc4
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=8516f52fa497b37eb3d5e58d34e61a41ae0a553a;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git

Merge branch 'next' into v3.1-rc4

Fixed trivial conflicts  in  drivers/dma/amba-pl08x.c

Signed-off-by: Vinod Koul <vinod.koul@intel.com>
---

8516f52fa497b37eb3d5e58d34e61a41ae0a553a
diff --cc drivers/dma/amba-pl08x.c
index be21e3f138a8,849eab85514b..3c2cad5b1165
--- a/drivers/dma/amba-pl08x.c
+++ b/drivers/dma/amba-pl08x.c
@@@ -77,17 -72,16 +72,17 @@@
  #include <linux/amba/bus.h>
  #include <linux/amba/pl08x.h>
  #include <linux/debugfs.h>
+ #include <linux/delay.h>
+ #include <linux/device.h>
+ #include <linux/dmaengine.h>
+ #include <linux/dmapool.h>
++#include <linux/dma-mapping.h>
+ #include <linux/init.h>
+ #include <linux/interrupt.h>
+ #include <linux/module.h>
+ #include <linux/pm_runtime.h>
  #include <linux/seq_file.h>
- 
+ #include <linux/slab.h>
  #include <asm/hardware/pl080.h>
  
  #define DRIVER_NAME	"pl08xdmac"