Merge remote-tracking branch 'ftrace/for-next'

[deliverable/linux.git] / drivers / media / i2c / soc_camera / Kconfig

diff --git a/drivers/media/i2c/soc_camera/Kconfig b/drivers/media/i2c/soc_camera/Kconfig
index 23d352f0adf0af58290e342aa4ed90f12b5df2e6..7704bcf5cc2537056df3d4d5ae021365e69cb16e 100644 (file)
--- a/drivers/media/i2c/soc_camera/Kconfig
+++ b/drivers/media/i2c/soc_camera/Kconfig
@@ -14,11 +14,14 @@ config SOC_CAMERA_MT9M001
          and colour models.
 
 config SOC_CAMERA_MT9M111
-       tristate "mt9m111, mt9m112 and mt9m131 support"
+       tristate "legacy soc_camera mt9m111, mt9m112 and mt9m131 support"
        depends on SOC_CAMERA && I2C
+       select VIDEO_MT9M111
        help
          This driver supports MT9M111, MT9M112 and MT9M131 cameras from
-         Micron/Aptina
+         Micron/Aptina.
+         This is the legacy configuration which shouldn't be used anymore,
+         while VIDEO_MT9M111 should be used instead.
 
 config SOC_CAMERA_MT9T031
        tristate "mt9t031 support"