diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-04-27 06:59:52 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-04-27 06:59:52 +0200 |
commit | 5f61f8673eb7cb7e3f982e1d9f3b71ba573763cf (patch) | |
tree | 2968989f296368170541370b163d39a901f4ecf5 /kernel-s390x.config | |
parent | 4c3c70e96895b8610b2183cd1204ac6152230001 (diff) | |
parent | bcc6bccc27ad7e94891d94a479b0e89dcb2ca511 (diff) | |
download | kernel-4.11.0-0.rc8.git2.1.vanilla.knurd.1.fc24.tar.gz kernel-4.11.0-0.rc8.git2.1.vanilla.knurd.1.fc24.tar.xz kernel-4.11.0-0.rc8.git2.1.vanilla.knurd.1.fc24.zip |
Merge remote-tracking branch 'origin/master'kernel-4.11.0-0.rc8.git2.1.vanilla.knurd.1.fc27kernel-4.11.0-0.rc8.git2.1.vanilla.knurd.1.fc26kernel-4.11.0-0.rc8.git2.1.vanilla.knurd.1.fc25kernel-4.11.0-0.rc8.git2.1.vanilla.knurd.1.fc24
Diffstat (limited to 'kernel-s390x.config')
-rw-r--r-- | kernel-s390x.config | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/kernel-s390x.config b/kernel-s390x.config index bf55a2a2f..afaecb425 100644 --- a/kernel-s390x.config +++ b/kernel-s390x.config @@ -676,7 +676,7 @@ CONFIG_CLS_U32_PERF=y CONFIG_CM32181=m # CONFIG_CM3232 is not set # CONFIG_CM3323 is not set -# CONFIG_CM3605 is not set +CONFIG_CM3605=m # CONFIG_CM36651 is not set # CONFIG_CMA is not set # CONFIG_CMDLINE_PARTITION is not set @@ -688,19 +688,6 @@ CONFIG_CODA_FS=m # CONFIG_COMMON_CLK_CDCE706 is not set # CONFIG_COMMON_CLK_CDCE925 is not set # CONFIG_COMMON_CLK_CS2000_CP is not set -# CONFIG_COMMON_CLK_HI3516CV300 is not set -# CONFIG_COMMON_CLK_HI3519 is not set -# CONFIG_COMMON_CLK_HI3798CV200 is not set -# CONFIG_COMMON_CLK_MT2701_BDPSYS is not set -# CONFIG_COMMON_CLK_MT2701_ETHSYS is not set -# CONFIG_COMMON_CLK_MT2701_HIFSYS is not set -# CONFIG_COMMON_CLK_MT2701_IMGSYS is not set -# CONFIG_COMMON_CLK_MT2701 is not set -# CONFIG_COMMON_CLK_MT2701_MMSYS is not set -# CONFIG_COMMON_CLK_MT2701_VDECSYS is not set -# CONFIG_COMMON_CLK_MT8135 is not set -# CONFIG_COMMON_CLK_MT8173 is not set -# CONFIG_COMMON_CLK_OXNAS is not set # CONFIG_COMMON_CLK_PWM is not set # CONFIG_COMMON_CLK_SI514 is not set # CONFIG_COMMON_CLK_SI5351 is not set @@ -4412,7 +4399,7 @@ CONFIG_SND_SEQUENCER=m CONFIG_SND_SEQUENCER_OSS=y CONFIG_SND_SERIAL_U16550=m CONFIG_SND_SIMPLE_CARD=m -# CONFIG_SND_SIMPLE_SCU_CARD is not set +CONFIG_SND_SIMPLE_SCU_CARD=m CONFIG_SND_SIS7019=m # CONFIG_SND_SOC_ADAU1701 is not set # CONFIG_SND_SOC_ADAU7002 is not set @@ -4463,6 +4450,7 @@ CONFIG_SND_SOC=m # CONFIG_SND_SOC_MAX9860 is not set # CONFIG_SND_SOC_MSM8916_WCD_ANALOG is not set # CONFIG_SND_SOC_MSM8916_WCD_DIGITAL is not set +# CONFIG_SND_SOC_NAU8540 is not set # CONFIG_SND_SOC_NAU8810 is not set # CONFIG_SND_SOC_PCM1681 is not set # CONFIG_SND_SOC_PCM179X_I2C is not set @@ -4485,6 +4473,7 @@ CONFIG_SND_SOC_SPDIF=m # CONFIG_SND_SOC_STI_SAS is not set # CONFIG_SND_SOC_TAS2552 is not set # CONFIG_SND_SOC_TAS5086 is not set +# CONFIG_SND_SOC_TAS571X is not set # CONFIG_SND_SOC_TAS5720 is not set # CONFIG_SND_SOC_TFA9879 is not set # CONFIG_SND_SOC_TLV320AIC23_I2C is not set |