diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-09-24 15:16:41 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-09-24 15:16:41 +0200 |
| commit | 02214bfc89c71bcc5167f653994cfa5c57f10ff1 (patch) | |
| tree | 078e9eb79f9a58d996c959bcc935317f8cbecfa9 /drivers/media/platform/Kconfig | |
| parent | 6bf4ca7fbc85d80446ac01c0d1d77db4d91a6d84 (diff) | |
| parent | 324493fba77500592bbaa66421729421f139d4b5 (diff) | |
| download | linux-stable-02214bfc89c71bcc5167f653994cfa5c57f10ff1.tar.gz linux-stable-02214bfc89c71bcc5167f653994cfa5c57f10ff1.tar.bz2 linux-stable-02214bfc89c71bcc5167f653994cfa5c57f10ff1.zip | |
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/media/platform/Kconfig')
| -rw-r--r-- | drivers/media/platform/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index 94c1fe0e9787..54fe90acb5b2 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -541,6 +541,8 @@ config VIDEO_CROS_EC_CEC depends on MFD_CROS_EC select CEC_CORE select CEC_NOTIFIER + select CHROME_PLATFORMS + select CROS_EC_PROTO ---help--- If you say yes here you will get support for the ChromeOS Embedded Controller's CEC. |