aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/media/video/omap3isp/isp.h4
-rw-r--r--include/media/omap3isp.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/video/omap3isp/isp.h b/drivers/media/video/omap3isp/isp.h
index f8d1f100fc19..38c6619a7723 100644
--- a/drivers/media/video/omap3isp/isp.h
+++ b/drivers/media/video/omap3isp/isp.h
@@ -238,10 +238,6 @@ void omap3isp_configure_bridge(struct isp_device *isp,
238 const struct isp_parallel_platform_data *pdata, 238 const struct isp_parallel_platform_data *pdata,
239 unsigned int shift); 239 unsigned int shift);
240 240
241#define ISP_XCLK_NONE 0
242#define ISP_XCLK_A 1
243#define ISP_XCLK_B 2
244
245struct isp_device *omap3isp_get(struct isp_device *isp); 241struct isp_device *omap3isp_get(struct isp_device *isp);
246void omap3isp_put(struct isp_device *isp); 242void omap3isp_put(struct isp_device *isp);
247 243
diff --git a/include/media/omap3isp.h b/include/media/omap3isp.h
index 042849a34640..3f4928df6ed0 100644
--- a/include/media/omap3isp.h
+++ b/include/media/omap3isp.h
@@ -29,6 +29,10 @@
29struct i2c_board_info; 29struct i2c_board_info;
30struct isp_device; 30struct isp_device;
31 31
32#define ISP_XCLK_NONE 0
33#define ISP_XCLK_A 1
34#define ISP_XCLK_B 2
35
32enum isp_interface_type { 36enum isp_interface_type {
33 ISP_INTERFACE_PARALLEL, 37 ISP_INTERFACE_PARALLEL,
34 ISP_INTERFACE_CSI2A_PHY2, 38 ISP_INTERFACE_CSI2A_PHY2,