summaryrefslogtreecommitdiffstats
path: root/arch/arm/common
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2013-07-22 19:50:11 -0700
committerOlof Johansson <olof@lixom.net>2013-07-22 19:54:21 -0700
commitcc23ee49d36fe5ce1435f75e5312bee9d76010c2 (patch)
tree0d8eeffb1d0a93316d8027c0d2c838145080623c /arch/arm/common
parentab116a4df4942c78c189d9b0744dd940ab9e00b9 (diff)
parentcf690331642010a837c026088588761f61528ddf (diff)
downloadblackbird-op-linux-cc23ee49d36fe5ce1435f75e5312bee9d76010c2.tar.gz
blackbird-op-linux-cc23ee49d36fe5ce1435f75e5312bee9d76010c2.zip
Merge tag 'davinci-fixes-for-v3.11-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into fixes
From Sekhar Nori: DaVinci fixes for v3.11-rc2 The pull request includes fixes for sparse warnings, defconfig changes to enable DMA usage on peripherals and removal of a duplicated include file. * tag 'davinci-fixes-for-v3.11-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci: ARM: davinci: defconfig: enable EDMA driver ARM: davinci: make file local variables static ARM: edma: remove duplicated include from edma.c Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/common')
-rw-r--r--arch/arm/common/edma.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/common/edma.c b/arch/arm/common/edma.c
index a432e6c1dac1..39ad030ac0c7 100644
--- a/arch/arm/common/edma.c
+++ b/arch/arm/common/edma.c
@@ -26,7 +26,6 @@
#include <linux/io.h>
#include <linux/slab.h>
#include <linux/edma.h>
-#include <linux/err.h>
#include <linux/of_address.h>
#include <linux/of_device.h>
#include <linux/of_dma.h>
OpenPOWER on IntegriCloud