diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2018-12-14 07:08:37 +0100 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2018-12-14 07:08:37 +0100 |
commit | abdf2b5e66b98986b06487507b96bcba64784350 (patch) | |
tree | 88966de937187bcdacf6c24d7862deb67559b5c0 /kernel-armv7hl-lpae-debug.config | |
parent | f424717c7cff54a87502307b005a33696089a584 (diff) | |
parent | 7fbdf3f0bf3132d686e4d4d9a658dca672f5992a (diff) | |
download | kernel-4.20.0-0.rc6.git2.1.vanilla.knurd.1.fc29.tar.gz kernel-4.20.0-0.rc6.git2.1.vanilla.knurd.1.fc29.tar.xz kernel-4.20.0-0.rc6.git2.1.vanilla.knurd.1.fc29.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-4.20.0-0.rc6.git2.1.vanilla.knurd.1.fc29
Diffstat (limited to 'kernel-armv7hl-lpae-debug.config')
-rw-r--r-- | kernel-armv7hl-lpae-debug.config | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config index 613ab32f8..157e5597e 100644 --- a/kernel-armv7hl-lpae-debug.config +++ b/kernel-armv7hl-lpae-debug.config @@ -3165,6 +3165,7 @@ CONFIG_MEDIA_CAMERA_SUPPORT=y CONFIG_MEDIA_CEC_RC=y CONFIG_MEDIA_CEC_SUPPORT=y # CONFIG_MEDIA_CONTROLLER_DVB is not set +# CONFIG_MEDIA_CONTROLLER_REQUEST_API is not set CONFIG_MEDIA_CONTROLLER=y CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y CONFIG_MEDIA_PCI_SUPPORT=y @@ -3282,6 +3283,7 @@ CONFIG_MFD_SM501=m # CONFIG_MFD_SMSC is not set # CONFIG_MFD_STMPE is not set CONFIG_MFD_SUN4I_GPADC=m +CONFIG_MFD_SUN6I_PRCM=y CONFIG_MFD_SYSCON=y # CONFIG_MFD_T7L66XB is not set # CONFIG_MFD_TC3589X is not set @@ -6815,7 +6817,6 @@ CONFIG_VIDEO_HDPVR=m CONFIG_VIDEO_HEXIUM_GEMINI=m CONFIG_VIDEO_HEXIUM_ORION=m # CONFIG_VIDEO_IMX_MEDIA is not set -CONFIG_VIDEO_IMX_PXP=m # CONFIG_VIDEO_IVTV_ALSA is not set # CONFIG_VIDEO_IVTV_DEPRECATED_IOCTLS is not set CONFIG_VIDEO_IVTV=m |