Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty...

[linux-imx.git] / arch / arm / common / edma.c

diff --git a/arch/arm/common/edma.c b/arch/arm/common/edma.c
index a432e6c1dac18fdf33d1b5d85bfb6c1b7e6cfed0..39ad030ac0c72b529b9cf3166a003b9feaa1f879 100644 (file)
--- 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>