diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2018-11-01 19:45:31 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2018-11-01 19:45:31 +0100 |
| commit | 51965522f24fdf114a56aa5dbaca40733947652a (patch) | |
| tree | 950b394a1b4f462a1d9d1b60ab688064f48e6cf5 /kernel-i686-debug.config | |
| parent | a59d2a403d404c335e5eae4cadcb7f35bdedf492 (diff) | |
| parent | 755a40d40db75b1018a8108b1a968ac1504c4682 (diff) | |
| download | kernel-51965522f24fdf114a56aa5dbaca40733947652a.tar.gz kernel-51965522f24fdf114a56aa5dbaca40733947652a.tar.xz kernel-51965522f24fdf114a56aa5dbaca40733947652a.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-4.20.0-0.rc0.git8.1.vanilla.knurd.1.fc29kernel-4.20.0-0.rc0.git8.1.vanilla.knurd.1.fc28
Diffstat (limited to 'kernel-i686-debug.config')
| -rw-r--r-- | kernel-i686-debug.config | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config index 6ba8c68bb..39568e46a 100644 --- a/kernel-i686-debug.config +++ b/kernel-i686-debug.config @@ -6559,6 +6559,7 @@ CONFIG_VIDEO_SR030PC30=m CONFIG_VIDEO_STK1160_AC97=y CONFIG_VIDEO_STK1160_COMMON=m CONFIG_VIDEO_STK1160=m +# CONFIG_VIDEO_SUNXI_CEDRUS is not set CONFIG_VIDEO_TM6000_ALSA=m CONFIG_VIDEO_TM6000_DVB=m CONFIG_VIDEO_TM6000=m |