aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Chen <b02280@freescale.com>2011-09-14 15:21:00 +0800
committerEric Miao <eric.miao@linaro.org>2011-11-15 16:28:28 +0800
commit871a232f8836c26ec8b9de438a5e1f7dbff0a652 (patch)
tree8c32b1613ad6e441b9bff5a133dc13b89c858b31
parent51fbdd7d5b03e8bcd81e84bda18063a173a21e06 (diff)
downloadlinux-linaro-871a232f8836c26ec8b9de438a5e1f7dbff0a652.tar.gz
ENGR00156673-3 ipuv3: move mach related definition to mach dir
for driver files. Signed-off-by: Jason Chen <b02280@freescale.com>
-rw-r--r--drivers/media/video/mxc/output/mxc_v4l2_output.h3
-rw-r--r--drivers/mxc/ipu3/ipu_calc_stripes_sizes.c2
-rw-r--r--drivers/mxc/ipu3/ipu_capture.c2
-rw-r--r--drivers/mxc/ipu3/ipu_common.c1
-rw-r--r--drivers/mxc/ipu3/ipu_device.c2
-rw-r--r--drivers/mxc/ipu3/ipu_disp.c2
-rw-r--r--drivers/mxc/ipu3/ipu_ic.c2
7 files changed, 6 insertions, 8 deletions
diff --git a/drivers/media/video/mxc/output/mxc_v4l2_output.h b/drivers/media/video/mxc/output/mxc_v4l2_output.h
index 39e4f69b23e..6ab0a4a990b 100644
--- a/drivers/media/video/mxc/output/mxc_v4l2_output.h
+++ b/drivers/media/video/mxc/output/mxc_v4l2_output.h
@@ -30,10 +30,9 @@
#ifdef __KERNEL__
-#include <linux/ipu.h>
-#include <mach/ipu-v3.h>
#include <linux/mxc_v4l2.h>
#include <linux/videodev2.h>
+#include <mach/ipu-v3.h>
#define MIN_FRAME_NUM 2
#define MAX_FRAME_NUM 30
diff --git a/drivers/mxc/ipu3/ipu_calc_stripes_sizes.c b/drivers/mxc/ipu3/ipu_calc_stripes_sizes.c
index 9a50794f4c9..1e05cc5808b 100644
--- a/drivers/mxc/ipu3/ipu_calc_stripes_sizes.c
+++ b/drivers/mxc/ipu3/ipu_calc_stripes_sizes.c
@@ -20,7 +20,7 @@
*/
#include <linux/module.h>
-#include <linux/ipu.h>
+#include <mach/ipu-v3.h>
#include <asm/div64.h>
#define BPP_32 0
diff --git a/drivers/mxc/ipu3/ipu_capture.c b/drivers/mxc/ipu3/ipu_capture.c
index 2399cb88d35..ff738453004 100644
--- a/drivers/mxc/ipu3/ipu_capture.c
+++ b/drivers/mxc/ipu3/ipu_capture.c
@@ -24,8 +24,8 @@
#include <linux/errno.h>
#include <linux/spinlock.h>
#include <linux/delay.h>
-#include <linux/ipu.h>
#include <linux/clk.h>
+#include <mach/ipu-v3.h>
#include "ipu_prv.h"
#include "ipu_regs.h"
diff --git a/drivers/mxc/ipu3/ipu_common.c b/drivers/mxc/ipu3/ipu_common.c
index c8a6136bfdc..33e0837f4f9 100644
--- a/drivers/mxc/ipu3/ipu_common.c
+++ b/drivers/mxc/ipu3/ipu_common.c
@@ -28,7 +28,6 @@
#include <linux/io.h>
#include <linux/irq.h>
#include <linux/irqdesc.h>
-#include <linux/ipu.h>
#include <linux/clk.h>
#include <mach/clock.h>
#include <mach/hardware.h>
diff --git a/drivers/mxc/ipu3/ipu_device.c b/drivers/mxc/ipu3/ipu_device.c
index 526fb4c950e..5f908be66df 100644
--- a/drivers/mxc/ipu3/ipu_device.c
+++ b/drivers/mxc/ipu3/ipu_device.c
@@ -32,9 +32,9 @@
#include <linux/slab.h>
#include <linux/dma-mapping.h>
#include <linux/io.h>
-#include <linux/ipu.h>
#include <linux/kthread.h>
#include <asm/cacheflush.h>
+#include <mach/ipu-v3.h>
#include "ipu_prv.h"
#include "ipu_regs.h"
diff --git a/drivers/mxc/ipu3/ipu_disp.c b/drivers/mxc/ipu3/ipu_disp.c
index 498a329b099..9e83dc5679e 100644
--- a/drivers/mxc/ipu3/ipu_disp.c
+++ b/drivers/mxc/ipu3/ipu_disp.c
@@ -24,11 +24,11 @@
#include <linux/delay.h>
#include <linux/spinlock.h>
#include <linux/io.h>
-#include <linux/ipu.h>
#include <linux/clk.h>
#include <linux/err.h>
#include <asm/atomic.h>
#include <mach/clock.h>
+#include <mach/ipu-v3.h>
#include "ipu_prv.h"
#include "ipu_regs.h"
#include "ipu_param_mem.h"
diff --git a/drivers/mxc/ipu3/ipu_ic.c b/drivers/mxc/ipu3/ipu_ic.c
index 7a31da200ed..7387e518deb 100644
--- a/drivers/mxc/ipu3/ipu_ic.c
+++ b/drivers/mxc/ipu3/ipu_ic.c
@@ -24,7 +24,7 @@
#include <linux/spinlock.h>
#include <linux/videodev2.h>
#include <linux/io.h>
-#include <linux/ipu.h>
+#include <mach/ipu-v3.h>
#include "ipu_prv.h"
#include "ipu_regs.h"