diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-07-10 14:37:54 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-07-10 14:37:54 +0200 |
| commit | c5ef78d0c9275607f52a3c7b4e0e8db0cfea92aa (patch) | |
| tree | 72dcd00304a9968402b7664d4de12986d09498db /kernel-armv7hl.config | |
| parent | baf8934e81bcda39bb16c22b2323062eaa9febd9 (diff) | |
| parent | 19bcf9a9c5aee882e28884edd9f5d965ee20f7bc (diff) | |
| download | kernel-c5ef78d0c9275607f52a3c7b4e0e8db0cfea92aa.tar.gz kernel-c5ef78d0c9275607f52a3c7b4e0e8db0cfea92aa.tar.xz kernel-c5ef78d0c9275607f52a3c7b4e0e8db0cfea92aa.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.3.0-0.rc0.git2.1.vanilla.knurd.1.fc31kernel-5.3.0-0.rc0.git2.1.vanilla.knurd.1.fc30kernel-5.3.0-0.rc0.git2.1.vanilla.knurd.1.fc29
Diffstat (limited to 'kernel-armv7hl.config')
| -rw-r--r-- | kernel-armv7hl.config | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config index 409599c18..6ed530b27 100644 --- a/kernel-armv7hl.config +++ b/kernel-armv7hl.config @@ -337,6 +337,7 @@ CONFIG_ARM_GLOBAL_TIMER=y CONFIG_ARM_HIGHBANK_CPUFREQ=m # CONFIG_ARM_HIGHBANK_CPUIDLE is not set CONFIG_ARM_IMX6Q_CPUFREQ=m +# CONFIG_ARM_IMX_CPUFREQ_DT is not set CONFIG_ARM_KPROBES_TEST=m # CONFIG_ARM_LPAE is not set CONFIG_ARM_MHU=m @@ -588,6 +589,7 @@ CONFIG_BE2NET=m CONFIG_BE2NET_SKYHAWK=y # CONFIG_BEFS_DEBUG is not set # CONFIG_BEFS_FS is not set +# CONFIG_BFQ_CGROUP_DEBUG is not set CONFIG_BFQ_GROUP_IOSCHED=y # CONFIG_BFS_FS is not set CONFIG_BH1750=m @@ -1645,6 +1647,7 @@ CONFIG_DVB_USB_AZ6007=m CONFIG_DVB_USB_AZ6027=m CONFIG_DVB_USB_CE6230=m CONFIG_DVB_USB_CINERGY_T2=m +CONFIG_DVB_USB_CXUSB_ANALOG=y CONFIG_DVB_USB_CXUSB=m # CONFIG_DVB_USB_DEBUG is not set CONFIG_DVB_USB_DIB0700=m @@ -3085,8 +3088,10 @@ CONFIG_LEDS_PCA9532=m CONFIG_LEDS_PM8058=m CONFIG_LEDS_PWM=m CONFIG_LEDS_REGULATOR=m +# CONFIG_LEDS_SPI_BYTE is not set CONFIG_LEDS_SYSCON=y CONFIG_LEDS_TCA6507=m +# CONFIG_LEDS_TI_LMU_COMMON is not set # CONFIG_LEDS_TLC591XX is not set CONFIG_LEDS_TRIGGER_ACTIVITY=m CONFIG_LEDS_TRIGGER_AUDIO=m @@ -4941,7 +4946,7 @@ CONFIG_RCU_NOCB_CPU=y # CONFIG_RCU_PERF_TEST is not set CONFIG_RCU_TORTURE_TEST=m # CONFIG_RCU_TRACE is not set -# CONFIG_RC_XBOX_DVD is not set +CONFIG_RC_XBOX_DVD=m CONFIG_RD_BZIP2=y CONFIG_RD_GZIP=y CONFIG_RD_LZ4=y @@ -5017,6 +5022,8 @@ CONFIG_REGULATOR_RK808=y CONFIG_REGULATOR_S2MPA01=m CONFIG_REGULATOR_S2MPS11=m CONFIG_REGULATOR_S5M8767=m +# CONFIG_REGULATOR_SLG51000 is not set +# CONFIG_REGULATOR_STM32_BOOSTER is not set CONFIG_REGULATOR_STM32_PWR=y CONFIG_REGULATOR_STM32_VREFBUF=m CONFIG_REGULATOR_STPMIC1=m @@ -5912,6 +5919,7 @@ CONFIG_SND_MAX_CARDS=32 # CONFIG_SND_MESON_AXG_TDMIN is not set # CONFIG_SND_MESON_AXG_TDMOUT is not set # CONFIG_SND_MESON_AXG_TODDR is not set +CONFIG_SND_MESON_G12A_TOHDMITX=m CONFIG_SND_MIA=m CONFIG_SND_MIXART=m CONFIG_SND_MIXER_OSS=m @@ -5991,6 +5999,7 @@ CONFIG_SND_SOC_CS43130=m # CONFIG_SND_SOC_CS4341 is not set # CONFIG_SND_SOC_CS4349 is not set # CONFIG_SND_SOC_CS53L30 is not set +CONFIG_SND_SOC_CX2072X=m CONFIG_SND_SOC_DAVINCI_MCASP=m CONFIG_SND_SOC_DMIC=m CONFIG_SND_SOC_ES7134=m @@ -6304,6 +6313,7 @@ CONFIG_SPI_STM32_QSPI=m CONFIG_SPI_ST_SSC4=m CONFIG_SPI_SUN4I=m CONFIG_SPI_SUN6I=m +# CONFIG_SPI_SYNQUACER is not set CONFIG_SPI_TEGRA114=m CONFIG_SPI_TEGRA20_SFLASH=m CONFIG_SPI_TEGRA20_SLINK=m @@ -7261,6 +7271,7 @@ CONFIG_VIA_RHINE=m CONFIG_VIA_RHINE_MMIO=y CONFIG_VIA_VELOCITY=m # CONFIG_VIDEO_ADV_DEBUG is not set +# CONFIG_VIDEO_ALLEGRO_DVT is not set CONFIG_VIDEO_AM437X_VPFE=m # CONFIG_VIDEO_ASPEED is not set CONFIG_VIDEO_AU0828=m @@ -7303,6 +7314,7 @@ CONFIG_VIDEO_GO7007_LOADER=m CONFIG_VIDEO_GO7007=m CONFIG_VIDEO_GO7007_USB=m CONFIG_VIDEO_GO7007_USB_S2250_BOARD=m +# CONFIG_VIDEO_HANTRO is not set CONFIG_VIDEO_HDPVR=m CONFIG_VIDEO_HEXIUM_GEMINI=m CONFIG_VIDEO_HEXIUM_ORION=m @@ -7315,6 +7327,7 @@ CONFIG_VIDEO_IVTV=m # CONFIG_VIDEO_MEM2MEM_DEINTERLACE is not set CONFIG_VIDEO_MESON_AO_CEC=m CONFIG_VIDEO_MESON_G12A_AO_CEC=m +# CONFIG_VIDEO_MESON_VDEC is not set CONFIG_VIDEO_MEYE=m # CONFIG_VIDEO_MMP_CAMERA is not set CONFIG_VIDEO_MUX=m |