diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-02-06 09:32:06 +0100 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-02-06 09:32:06 +0100 |
commit | 7bddba775026d51dede9d726bd8158574c0ec5a6 (patch) | |
tree | 6ec6b7cfd9ef9a7915bf1f4ce13cff1d3944694f /drivers/media/i2c/Kconfig | |
parent | Merge tag 'usb-ci-v4.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git... (diff) | |
parent | Linux 4.10-rc7 (diff) | |
download | linux-7bddba775026d51dede9d726bd8158574c0ec5a6.tar.xz linux-7bddba775026d51dede9d726bd8158574c0ec5a6.zip |
Merge 4.10-rc7 into usb-next
We want the USB fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/media/i2c/Kconfig')
-rw-r--r-- | drivers/media/i2c/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/media/i2c/Kconfig b/drivers/media/i2c/Kconfig index b31fa6fae009..b979ea148251 100644 --- a/drivers/media/i2c/Kconfig +++ b/drivers/media/i2c/Kconfig @@ -655,6 +655,7 @@ config VIDEO_S5K6A3 config VIDEO_S5K4ECGX tristate "Samsung S5K4ECGX sensor support" depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API + select CRC32 ---help--- This is a V4L2 sensor-level driver for Samsung S5K4ECGX 5M camera sensor with an embedded SoC image signal processor. |