diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-08-31 15:18:49 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-08-31 15:18:49 +0200 |
| commit | 89964532af24450f52b6d01dacd294217911419e (patch) | |
| tree | 6107bc5d1b68f05be5192c06027349030291ed60 /kernel-armv7hl-fedora.config | |
| parent | 3dfb76094b2877be42c5c59e3dd88c08a12dfe54 (diff) | |
| parent | b41e8da84d859a942949cba537c8ea69d0e87df4 (diff) | |
| download | kernel-89964532af24450f52b6d01dacd294217911419e.tar.gz kernel-89964532af24450f52b6d01dacd294217911419e.tar.xz kernel-89964532af24450f52b6d01dacd294217911419e.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.9.0-0.rc3.1.vanilla.2.fc34kernel-5.9.0-0.rc3.1.vanilla.2.fc33kernel-5.9.0-0.rc3.1.vanilla.2.fc32kernel-5.9.0-0.rc3.1.vanilla.2.fc31
Diffstat (limited to 'kernel-armv7hl-fedora.config')
| -rw-r--r-- | kernel-armv7hl-fedora.config | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config index b27f46cb9..d0dab36f0 100644 --- a/kernel-armv7hl-fedora.config +++ b/kernel-armv7hl-fedora.config @@ -5100,6 +5100,7 @@ CONFIG_POWER_RESET=y # CONFIG_POWER_SUPPLY_DEBUG is not set CONFIG_POWER_SUPPLY_HWMON=y CONFIG_POWER_SUPPLY=y +# CONFIG_PPC_PROT_SAO_LPAR is not set # CONFIG_PPC_PTDUMP is not set # CONFIG_PPC_QUEUED_SPINLOCKS is not set CONFIG_PPDEV=m @@ -8021,7 +8022,7 @@ CONFIG_VIDEO_SUNXI_CEDRUS=m CONFIG_VIDEO_SUNXI=y CONFIG_VIDEO_TEGRA_HDMI_CEC=m CONFIG_VIDEO_TEGRA=m -# CONFIG_VIDEO_TI_CAL is not set +CONFIG_VIDEO_TI_CAL=m # CONFIG_VIDEO_TI_VPE_DEBUG is not set CONFIG_VIDEO_TI_VPE=m CONFIG_VIDEO_TM6000_ALSA=m |