summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorRobby Cai <R63905@freescale.com>2013-03-22 13:27:11 +0800
committerRobby Cai <R63905@freescale.com>2013-03-22 17:53:22 +0800
commit225b3f93ba1103e9e268b220ff7f32490a4fdf51 (patch)
treef5e7d03947b37214c3c968eecc534772a64d0229 /drivers
parent0c6379a125419b30ac828c05649167dac50e5ace (diff)
ENGR00255491 ov5640: Fix build break by make modules
Fix the kernel modules building error for mx6q/mx6dl as follows: LD [M] drivers/usb/gadget/g_serial.o Building modules, stage 2. MODPOST 48 modules ERROR: "csi_enable_mclk" [drivers/media/video/mxc/capture/ov5640_camera.ko] undefined! make[1]: *** [__modpost] Error 1 make: *** [modules] Error 2 Signed-off-by: Robby Cai <R63905@freescale.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/media/video/mxc/capture/ov5640.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/media/video/mxc/capture/ov5640.c b/drivers/media/video/mxc/capture/ov5640.c
index fabbc23645cc..eb620190ab1d 100644
--- a/drivers/media/video/mxc/capture/ov5640.c
+++ b/drivers/media/video/mxc/capture/ov5640.c
@@ -1823,8 +1823,9 @@ static int ov5640_probe(struct i2c_client *client,
if (plat_data->pwdn)
plat_data->pwdn(0);
- if (cpu_is_mx6sl())
- csi_enable_mclk(CSI_MCLK_I2C, true, true);
+#ifdef CONFIG_SOC_IMX6SL
+ csi_enable_mclk(CSI_MCLK_I2C, true, true);
+#endif
retval = ov5640_read_reg(OV5640_CHIP_ID_HIGH_BYTE, &chip_id_high);
if (retval < 0 || chip_id_high != 0x56) {
pr_warning("camera ov5640 is not found\n");
@@ -1841,8 +1842,9 @@ static int ov5640_probe(struct i2c_client *client,
if (plat_data->pwdn)
plat_data->pwdn(1);
- if (cpu_is_mx6sl())
- csi_enable_mclk(CSI_MCLK_I2C, false, false);
+#ifdef CONFIG_SOC_IMX6SL
+ csi_enable_mclk(CSI_MCLK_I2C, false, false);
+#endif
camera_plat = plat_data;