diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-12-06 20:42:16 +0100 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-12-06 20:42:16 +0100 |
commit | 1429580bfd405c147e4bde3a00b270b07b2e6c13 (patch) | |
tree | 5b4049bd5657007584c269325afeea490ed52c2e /kernel-armv7hl-fedora.config | |
parent | 889961e7d1825ddabd68eaa9ea87e8700cb14783 (diff) | |
parent | 4bdf8f6ab4722f4a976929b018b57029a197ffc7 (diff) | |
download | kernel-1429580bfd405c147e4bde3a00b270b07b2e6c13.tar.gz kernel-1429580bfd405c147e4bde3a00b270b07b2e6c13.tar.xz kernel-1429580bfd405c147e4bde3a00b270b07b2e6c13.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.5.0-0.rc0.git7.1.vanilla.knurd.1.fc32kernel-5.5.0-0.rc0.git7.1.vanilla.knurd.1.fc31kernel-5.5.0-0.rc0.git7.1.vanilla.knurd.1.fc30
Diffstat (limited to 'kernel-armv7hl-fedora.config')
-rw-r--r-- | kernel-armv7hl-fedora.config | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config index a0535e7bc..065a0c878 100644 --- a/kernel-armv7hl-fedora.config +++ b/kernel-armv7hl-fedora.config @@ -179,6 +179,7 @@ CONFIG_AMD8111_ETH=m CONFIG_AMD_PHY=m # CONFIG_AMD_XGBE_DCB is not set CONFIG_AMIGA_PARTITION=y +CONFIG_AMLOGIC_THERMAL=m CONFIG_AMX3_PM=m # CONFIG_ANDROID is not set # CONFIG_APDS9300 is not set @@ -253,6 +254,7 @@ CONFIG_ARCH_QCOM=y # CONFIG_ARCH_RENESAS is not set CONFIG_ARCH_ROCKCHIP=y # CONFIG_ARCH_RPC is not set +# CONFIG_ARCH_S32 is not set # CONFIG_ARCH_S3C24XX is not set # CONFIG_ARCH_S5PV210 is not set # CONFIG_ARCH_SA1100 is not set @@ -1825,6 +1827,7 @@ CONFIG_EXTCON_USBC_CROS_EC=m CONFIG_EXTCON_USB_GPIO=m CONFIG_EXTCON=y CONFIG_EXTRA_FIRMWARE="" +# CONFIG_EXYNOS5422_DMC is not set CONFIG_EXYNOS_ADC=m CONFIG_EXYNOS_AUDSS_CLK_CON=m # CONFIG_EXYNOS_IOMMU_DEBUG is not set @@ -1968,6 +1971,7 @@ CONFIG_FSL_ENETC_QOS=y # CONFIG_FSL_IMX8_DDR_PMU is not set # CONFIG_FSL_PQ_MDIO is not set # CONFIG_FSL_QDMA is not set +# CONFIG_FSL_RCPM is not set # CONFIG_FSL_XGMAC_MDIO is not set CONFIG_FS_MBCACHE=y CONFIG_FSNOTIFY=y @@ -3229,6 +3233,7 @@ CONFIG_MACH_DOVE=y # CONFIG_MACH_MESON6 is not set # CONFIG_MACH_MESON8 is not set CONFIG_MACH_MMP2_DT=y +# CONFIG_MACH_MMP3_DT is not set # CONFIG_MACH_OMAP3517EVM is not set # CONFIG_MACH_OMAP3_PANDORA is not set CONFIG_MACH_STM32MP157=y @@ -6617,6 +6622,7 @@ CONFIG_TEE=m CONFIG_TEGRA124_EMC=y CONFIG_TEGRA20_APB_DMA=y CONFIG_TEGRA20_EMC=y +CONFIG_TEGRA30_EMC=y CONFIG_TEGRA_AHB=y # CONFIG_TEGRA_BPMP is not set CONFIG_TEGRA_GMI=m |