Merge tag 'fbdev-updates-for-3.7' of git://github.com/schandinat/linux-2.6

[mirror_ubuntu-zesty-kernel.git] / drivers / video / mx3fb.c

diff --git a/drivers/video/mx3fb.c b/drivers/video/mx3fb.c
index c63ddb11e05055ec2285701ca71b9ee1f80e8683..ce1d452464ed5171d537346bdd1a0132a7d321d1 100644 (file)
--- a/drivers/video/mx3fb.c
+++ b/drivers/video/mx3fb.c
@@ -27,10 +27,10 @@
 #include <linux/clk.h>
 #include <linux/mutex.h>
 
-#include <mach/dma.h>
+#include <linux/platform_data/dma-imx.h>
 #include <mach/hardware.h>
 #include <mach/ipu.h>
-#include <mach/mx3fb.h>
+#include <linux/platform_data/video-mx3fb.h>
 
 #include <asm/io.h>
 #include <asm/uaccess.h>