From c41708e6ae3e59166dba465cf3e412af821031f8 Mon Sep 17 00:00:00 2001 From: Sakari Ailus Date: Sun, 11 Dec 2011 09:57:51 -0300 Subject: [PATCH] --- yaml --- r: 306280 b: refs/heads/master c: 618b055bc9c7253677520c1536a47540c3647a1a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/video/omap3isp/isp.h | 4 ---- trunk/include/media/omap3isp.h | 4 ++++ 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index b3a6a8d85343..2cfd15506792 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8f4f298e027bc58513811d7bbb7bfa457b0026c3 +refs/heads/master: 618b055bc9c7253677520c1536a47540c3647a1a diff --git a/trunk/drivers/media/video/omap3isp/isp.h b/trunk/drivers/media/video/omap3isp/isp.h index f8d1f100fc19..38c6619a7723 100644 --- a/trunk/drivers/media/video/omap3isp/isp.h +++ b/trunk/drivers/media/video/omap3isp/isp.h @@ -238,10 +238,6 @@ void omap3isp_configure_bridge(struct isp_device *isp, const struct isp_parallel_platform_data *pdata, unsigned int shift); -#define ISP_XCLK_NONE 0 -#define ISP_XCLK_A 1 -#define ISP_XCLK_B 2 - struct isp_device *omap3isp_get(struct isp_device *isp); void omap3isp_put(struct isp_device *isp); diff --git a/trunk/include/media/omap3isp.h b/trunk/include/media/omap3isp.h index 042849a34640..3f4928df6ed0 100644 --- a/trunk/include/media/omap3isp.h +++ b/trunk/include/media/omap3isp.h @@ -29,6 +29,10 @@ struct i2c_board_info; struct isp_device; +#define ISP_XCLK_NONE 0 +#define ISP_XCLK_A 1 +#define ISP_XCLK_B 2 + enum isp_interface_type { ISP_INTERFACE_PARALLEL, ISP_INTERFACE_CSI2A_PHY2,