summaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorStephen Rothwell2015-04-13 04:48:27 +0200
committerLinus Torvalds2015-04-26 18:56:08 +0200
commit4a6554665c62ee39be40f4a18c3d37e49d03ccc1 (patch)
tree9b455f45f0763661f019e55a0a59f77d9c529c2d /drivers/media
parentMerge tag 'sound-fix-4.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff)
downloadkernel-qcow2-linux-4a6554665c62ee39be40f4a18c3d37e49d03ccc1.tar.gz
kernel-qcow2-linux-4a6554665c62ee39be40f4a18c3d37e49d03ccc1.tar.xz
kernel-qcow2-linux-4a6554665c62ee39be40f4a18c3d37e49d03ccc1.zip
v4l: xilinx: fix for include file movement
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/platform/xilinx/xilinx-dma.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/platform/xilinx/xilinx-dma.c b/drivers/media/platform/xilinx/xilinx-dma.c
index 10209c294168..efde88adf624 100644
--- a/drivers/media/platform/xilinx/xilinx-dma.c
+++ b/drivers/media/platform/xilinx/xilinx-dma.c
@@ -12,7 +12,7 @@
* published by the Free Software Foundation.
*/
-#include <linux/amba/xilinx_dma.h>
+#include <linux/dma/xilinx_dma.h>
#include <linux/lcm.h>
#include <linux/list.h>
#include <linux/module.h>