diff options
author | Laura Abbott <labbott@fedoraproject.org> | 2017-07-07 07:59:21 -0700 |
---|---|---|
committer | Laura Abbott <labbott@fedoraproject.org> | 2017-07-07 07:59:21 -0700 |
commit | cd35ee37534cb354b10a3544232a3b999467cb87 (patch) | |
tree | 08a6a1c6a5f1dfaa2242d67926574ea5e4d10dff /kernel-s390x.config | |
parent | 93120b23f4df603ce37b5a8c83873ac8f85941c0 (diff) | |
download | kernel-cd35ee37534cb354b10a3544232a3b999467cb87.tar.gz kernel-cd35ee37534cb354b10a3544232a3b999467cb87.tar.xz kernel-cd35ee37534cb354b10a3544232a3b999467cb87.zip |
Linux v4.12-7934-g9f45efb
Diffstat (limited to 'kernel-s390x.config')
-rw-r--r-- | kernel-s390x.config | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/kernel-s390x.config b/kernel-s390x.config index 638b26f30..9f67645dc 100644 --- a/kernel-s390x.config +++ b/kernel-s390x.config @@ -996,6 +996,7 @@ CONFIG_DM_UEVENT=y CONFIG_DM_VERITY_FEC=y CONFIG_DM_VERITY=m CONFIG_DM_ZERO=y +CONFIG_DM_ZONED=m # CONFIG_DNET is not set CONFIG_DNOTIFY=y CONFIG_DNS_RESOLVER=m @@ -3520,6 +3521,7 @@ CONFIG_PCNET32=m CONFIG_PD6729=m # CONFIG_PDA_POWER is not set CONFIG_PDC_ADMA=m +# CONFIG_PERCPU_STATS is not set # CONFIG_PERCPU_TEST is not set CONFIG_PERF_EVENTS=y CONFIG_PERSISTENT_KEYRINGS=y @@ -3539,7 +3541,10 @@ CONFIG_PHYLIB=m # CONFIG_PHY_TUSB1210 is not set CONFIG_PID_NS=y # CONFIG_PINCONF is not set +# CONFIG_PINCTRL_CANNONLAKE is not set +# CONFIG_PINCTRL_IPQ8074 is not set # CONFIG_PINCTRL is not set +# CONFIG_PINCTRL_MCP23S08 is not set # CONFIG_PINCTRL_SX150X is not set # CONFIG_PINMUX is not set CONFIG_PKCS7_MESSAGE_PARSER=y @@ -3776,6 +3781,7 @@ CONFIG_ROMFS_FS=m CONFIG_ROSE=m CONFIG_RPCSEC_GSS_KRB5=m # CONFIG_RPMSG_CHAR is not set +# CONFIG_RPMSG_QCOM_GLINK_RPM is not set CONFIG_RPR0521=m CONFIG_RSI_91X=m CONFIG_RSI_DEBUGFS=y @@ -4344,6 +4350,7 @@ CONFIG_SKGE=m # CONFIG_SKY2_DEBUG is not set CONFIG_SKY2=m CONFIG_SLAB_FREELIST_RANDOM=y +CONFIG_SLAB_MERGE_DEFAULT=y # CONFIG_SLICOSS is not set CONFIG_SLIP_COMPRESSED=y # CONFIG_SLIP is not set @@ -4383,6 +4390,8 @@ CONFIG_SND_ATIIXP_MODEM=m CONFIG_SND_AU8810=m CONFIG_SND_AU8820=m CONFIG_SND_AU8830=m +# CONFIG_SND_AUDIO_GRAPH_CARD is not set +# CONFIG_SND_AUDIO_GRAPH_SCU_CARD is not set # CONFIG_SND_AW2 is not set CONFIG_SND_AZT3328=m # CONFIG_SND_BCD2000 is not set @@ -4501,7 +4510,7 @@ CONFIG_SND_RME96=m CONFIG_SND_SEQ_DUMMY=m CONFIG_SND_SEQ_HRTIMER_DEFAULT=y CONFIG_SND_SEQUENCER=m -CONFIG_SND_SEQUENCER_OSS=y +CONFIG_SND_SEQUENCER_OSS=m CONFIG_SND_SERIAL_U16550=m CONFIG_SND_SIMPLE_CARD=m CONFIG_SND_SIMPLE_SCU_CARD=m @@ -4540,6 +4549,7 @@ CONFIG_SND_SOC_CS42L42=m CONFIG_SND_SOC_DIO2125=m CONFIG_SND_SOC_DMIC=m CONFIG_SND_SOC_ES7134=m +# CONFIG_SND_SOC_ES8316 is not set # CONFIG_SND_SOC_ES8328 is not set # CONFIG_SND_SOC_FSL_ASOC_CARD is not set # CONFIG_SND_SOC_FSL_ASRC is not set @@ -4572,6 +4582,7 @@ CONFIG_SND_SOC_NAU8824=m # CONFIG_SND_SOC_PCM3168A_SPI is not set # CONFIG_SND_SOC_PCM512x_I2C is not set # CONFIG_SND_SOC_PCM512x_SPI is not set +# CONFIG_SND_SOC_ROCKCHIP_PDM is not set # CONFIG_SND_SOC_RT5616 is not set # CONFIG_SND_SOC_RT5631 is not set # CONFIG_SND_SOC_SGTL5000 is not set @@ -4616,6 +4627,7 @@ CONFIG_SND_SOC_SPDIF=m # CONFIG_SND_SOC_WM8978 is not set # CONFIG_SND_SOC_WM8985 is not set # CONFIG_SND_SOC_XTFPGA_I2S is not set +# CONFIG_SND_SOC_ZX_AUD96P22 is not set CONFIG_SND_SONICVIBES=m # CONFIG_SND_SPI is not set # CONFIG_SND_SUPPORT_OLD_API is not set @@ -4963,6 +4975,7 @@ CONFIG_TOUCHSCREEN_ZFORCE=m # CONFIG_TPS6507X is not set # CONFIG_TRACE_BRANCH_PROFILING is not set # CONFIG_TRACE_ENUM_MAP_FILE is not set +CONFIG_TRACE_EVAL_MAP_FILE=y # CONFIG_TRACEPOINT_BENCHMARK is not set # CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP is not set CONFIG_TRACER_SNAPSHOT=y @@ -5433,6 +5446,7 @@ CONFIG_VIDEO_NOON010PC30=m CONFIG_VIDEO_PVRUSB2_DVB=y CONFIG_VIDEO_PVRUSB2=m CONFIG_VIDEO_PVRUSB2_SYSFS=y +# CONFIG_VIDEO_QCOM_VENUS is not set # CONFIG_VIDEO_RENESAS_VSP1 is not set CONFIG_VIDEO_SAA6588=m CONFIG_VIDEO_SAA7134_ALSA=m |