diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-08-24 16:26:27 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-08-24 16:26:27 +0200 |
commit | 3e69d0c28fcf4dae0d7996b65e1849ef0d0da70e (patch) | |
tree | f49795de3f8aaae86e73f6a1f21b7b1948048311 /kernel-armv7hl-lpae-debug-fedora.config | |
parent | c01e23554af1d0635829396c9b8b7f5040a2d7d3 (diff) | |
parent | 427e0b0cd9f365866f7b2517c77ed712f5df9cc7 (diff) | |
download | kernel-3e69d0c28fcf4dae0d7996b65e1849ef0d0da70e.tar.gz kernel-3e69d0c28fcf4dae0d7996b65e1849ef0d0da70e.tar.xz kernel-3e69d0c28fcf4dae0d7996b65e1849ef0d0da70e.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.9.0-0.rc2.1.vanilla.2.fc34kernel-5.9.0-0.rc2.1.vanilla.2.fc33kernel-5.9.0-0.rc2.1.vanilla.2.fc32kernel-5.9.0-0.rc2.1.vanilla.2.fc31
Diffstat (limited to 'kernel-armv7hl-lpae-debug-fedora.config')
-rw-r--r-- | kernel-armv7hl-lpae-debug-fedora.config | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config index 672efdb53..8c86199b3 100644 --- a/kernel-armv7hl-lpae-debug-fedora.config +++ b/kernel-armv7hl-lpae-debug-fedora.config @@ -7768,7 +7768,7 @@ CONFIG_VIDEO_SUNXI_CEDRUS=m CONFIG_VIDEO_SUNXI=y CONFIG_VIDEO_TEGRA_HDMI_CEC=m CONFIG_VIDEO_TEGRA=m -CONFIG_VIDEO_TI_CAL=m +# CONFIG_VIDEO_TI_CAL is not set # CONFIG_VIDEO_TI_VPE_DEBUG is not set CONFIG_VIDEO_TI_VPE=m CONFIG_VIDEO_TM6000_ALSA=m |