diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-07-21 21:33:06 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-07-21 21:33:06 +0200 |
| commit | 401dc5164914b855de3cd99e34869e79ccd9480c (patch) | |
| tree | dfbfda4512058195d6ca7683875fb23e50686b48 /kernel-armv7hl-lpae-fedora.config | |
| parent | 145a17d9e047c263b718cbe4bc243d0ee1ecf466 (diff) | |
| parent | b6670052876b21ed6905a8eb2be5258291a0b38b (diff) | |
| download | kernel-401dc5164914b855de3cd99e34869e79ccd9480c.tar.gz kernel-401dc5164914b855de3cd99e34869e79ccd9480c.tar.xz kernel-401dc5164914b855de3cd99e34869e79ccd9480c.zip | |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.14.0-0.rc2.20210721git8cae8cd89f05.24.vanilla.1.fc34
Diffstat (limited to 'kernel-armv7hl-lpae-fedora.config')
| -rw-r--r-- | kernel-armv7hl-lpae-fedora.config | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config index aa29aa5f4..e37491aa3 100644 --- a/kernel-armv7hl-lpae-fedora.config +++ b/kernel-armv7hl-lpae-fedora.config @@ -1869,8 +1869,7 @@ CONFIG_DUMMY_CONSOLE=y # CONFIG_DUMMY_IRQ is not set CONFIG_DUMMY=m CONFIG_DVB_AS102=m -CONFIG_DVB_AV7110=m -CONFIG_DVB_AV7110_OSD=y +# CONFIG_DVB_AV7110 is not set CONFIG_DVB_B2C2_FLEXCOP=m # CONFIG_DVB_B2C2_FLEXCOP_PCI_DEBUG is not set CONFIG_DVB_B2C2_FLEXCOP_PCI=m @@ -1881,7 +1880,7 @@ CONFIG_DVB_BUDGET_AV=m CONFIG_DVB_BUDGET_CI=m CONFIG_DVB_BUDGET_CORE=m CONFIG_DVB_BUDGET=m -CONFIG_DVB_BUDGET_PATCH=m +# CONFIG_DVB_BUDGET_PATCH is not set CONFIG_DVB_CORE=m CONFIG_DVB_CXD2099=m CONFIG_DVB_DDBRIDGE=m |