diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-09-24 16:16:41 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-09-24 16:16:41 +0300 |
| commit | 02214bfc89c71bcc5167f653994cfa5c57f10ff1 (patch) | |
| tree | 078e9eb79f9a58d996c959bcc935317f8cbecfa9 /drivers/staging | |
| parent | 6bf4ca7fbc85d80446ac01c0d1d77db4d91a6d84 (diff) | |
| parent | 324493fba77500592bbaa66421729421f139d4b5 (diff) | |
| download | linux-02214bfc89c71bcc5167f653994cfa5c57f10ff1.tar.xz | |
Merge tag 'media/v4.19-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
Mauro briefly writes:
"media fixes for v4.19-rc5
some drivers and Kbuild fixes"
* tag 'media/v4.19-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
media: platform: fix cros-ec-cec build error
media: staging/media/mt9t031/Kconfig: remove bogus entry
media: i2c: mt9v111: Fix v4l2-ctrl error handling
media: camss: add missing includes
media: camss: Use managed memory allocations
media: camss: mark PM functions as __maybe_unused
media: af9035: prevent buffer overflow on write
media: video_function_calls.rst: drop obsolete video-set-attributes reference
Diffstat (limited to 'drivers/staging')
| -rw-r--r-- | drivers/staging/media/mt9t031/Kconfig | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/staging/media/mt9t031/Kconfig b/drivers/staging/media/mt9t031/Kconfig index f48e06a03cdb..9a58aaf72edd 100644 --- a/drivers/staging/media/mt9t031/Kconfig +++ b/drivers/staging/media/mt9t031/Kconfig @@ -1,9 +1,3 @@ -config SOC_CAMERA_IMX074 - tristate "imx074 support (DEPRECATED)" - depends on SOC_CAMERA && I2C - help - This driver supports IMX074 cameras from Sony - config SOC_CAMERA_MT9T031 tristate "mt9t031 support (DEPRECATED)" depends on SOC_CAMERA && I2C |