summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--arch/arm/configs/imx6_android_defconfig2
-rw-r--r--arch/arm/mach-mx6/board-mx6q_arm2.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/configs/imx6_android_defconfig b/arch/arm/configs/imx6_android_defconfig
index 897b5b9e193e..8d353c494ddb 100644
--- a/arch/arm/configs/imx6_android_defconfig
+++ b/arch/arm/configs/imx6_android_defconfig
@@ -1678,7 +1678,7 @@ CONFIG_VIDEO_MXC_IPU_CAMERA=y
# CONFIG_MXC_CAMERA_MICRON111 is not set
# CONFIG_MXC_CAMERA_OV2640 is not set
# CONFIG_MXC_CAMERA_OV3640 is not set
-CONFIG_MXC_CAMERA_OV5640=y
+CONFIG_MXC_CAMERA_OV5642=y
# CONFIG_MXC_CAMERA_OV5640_MIPI is not set
# CONFIG_MXC_CAMERA_OV5642 is not set
CONFIG_MXC_IPU_PRP_VF_SDC=y
diff --git a/arch/arm/mach-mx6/board-mx6q_arm2.c b/arch/arm/mach-mx6/board-mx6q_arm2.c
index 6d1262f48fd6..2b93fb95dd15 100644
--- a/arch/arm/mach-mx6/board-mx6q_arm2.c
+++ b/arch/arm/mach-mx6/board-mx6q_arm2.c
@@ -677,7 +677,7 @@ static struct i2c_board_info mxc_i2c0_board_info[] __initdata = {
I2C_BOARD_INFO("cs42888", 0x48),
},
{
- I2C_BOARD_INFO("ov3640", 0x3c),
+ I2C_BOARD_INFO("ov5642", 0x3c),
.platform_data = (void *)&camera_data,
},
};