diff options
| author | Quinn Jensen <quinn.jensen@freescale.com> | 2007-10-24 21:22:45 -0600 |
|---|---|---|
| committer | Quinn Jensen <quinn.jensen@freescale.com> | 2007-10-24 21:22:45 -0600 |
| commit | 346c694b9688a3702e6b1f7251e3f8d3335b0bd3 (patch) | |
| tree | 9fd0586e33d5599c1cb4445861c9959ecabd7e36 /drivers | |
| parent | 31db830dbaffc629f2d9538b6ec0e8870d5d7865 (diff) | |
Work-around compile breakage for mx27 on ov2640 camera driver
Patch to work around compile breakage for mx27 on ov2640 camera driver.
Applies to linux 2.6.22 kernel on MX27 platform.
http://www.bitshrine.org/gpp/linux-2.6.22-mx-Work-around-compile-breakage-for-mx27-on-o.patch
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/media/video/mxc/capture/mx27_v4l2_capture.c | 3 | ||||
| -rw-r--r-- | drivers/media/video/mxc/capture/ov2640.c | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/drivers/media/video/mxc/capture/mx27_v4l2_capture.c b/drivers/media/video/mxc/capture/mx27_v4l2_capture.c index 0ebc9644050b..d6d91bda3e98 100644 --- a/drivers/media/video/mxc/capture/mx27_v4l2_capture.c +++ b/drivers/media/video/mxc/capture/mx27_v4l2_capture.c @@ -41,7 +41,8 @@ static int csi_mclk_flag_backup; static int video_nr = -1; -static cam_data *g_cam; +cam_data *g_cam; +EXPORT_SYMBOL(g_cam); static int dq_intr_cnt=0; static int dq_timeout_cnt=0; diff --git a/drivers/media/video/mxc/capture/ov2640.c b/drivers/media/video/mxc/capture/ov2640.c index 640b149d1d0d..20f1be44a50d 100644 --- a/drivers/media/video/mxc/capture/ov2640.c +++ b/drivers/media/video/mxc/capture/ov2640.c @@ -688,10 +688,12 @@ static sensor_interface *ov2640_config(int *frame_rate, int high_quality) g_cam->crop_bounds.top = 0; g_cam->crop_bounds.height = 1120; g_cam->crop_current = g_cam->crop_defrect = g_cam->crop_bounds; +#ifdef CONFIG_ARCH_MX3 ipu_csi_set_window_size(g_cam->crop_current.width, g_cam->crop_current.height); ipu_csi_set_window_pos(g_cam->crop_current.left, g_cam->crop_current.top); +#endif g_cam->streamparm.parm.capture.capturemode = 1; } else { out_width = 640; @@ -701,10 +703,12 @@ static sensor_interface *ov2640_config(int *frame_rate, int high_quality) g_cam->crop_bounds.top = 0; g_cam->crop_bounds.height = 480; g_cam->crop_current = g_cam->crop_defrect = g_cam->crop_bounds; +#ifdef CONFIG_ARCH_MX3 ipu_csi_set_window_size(g_cam->crop_current.width, g_cam->crop_current.height); ipu_csi_set_window_pos(g_cam->crop_current.left, g_cam->crop_current.top); +#endif g_cam->streamparm.parm.capture.capturemode = 0; } ov2640_interface(interface_param, out_width, out_height); |