summaryrefslogtreecommitdiffstats
path: root/kernel-s390x.config
diff options
context:
space:
mode:
authorJustin M. Forbes <jforbes@redhat.com>2016-12-16 09:42:31 -0600
committerJustin M. Forbes <jforbes@redhat.com>2016-12-16 09:42:31 -0600
commitccbb0995018bcd1ad4219c16668043b3906d9611 (patch)
tree12687288fda57275240fda4e4a8d41c6098b009b /kernel-s390x.config
parent84f938c2ad1cc6d6a3073e3f273cb78ef9ccb4c4 (diff)
downloadkernel-ccbb0995018bcd1ad4219c16668043b3906d9611.tar.gz
kernel-ccbb0995018bcd1ad4219c16668043b3906d9611.tar.xz
kernel-ccbb0995018bcd1ad4219c16668043b3906d9611.zip
Linux v4.9-10415-g73e2e0c
Diffstat (limited to 'kernel-s390x.config')
-rw-r--r--kernel-s390x.config19
1 files changed, 17 insertions, 2 deletions
diff --git a/kernel-s390x.config b/kernel-s390x.config
index 8a307b8ed..dcbfcd371 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -181,10 +181,12 @@ CONFIG_APPLDATA_OS=m
CONFIG_AQUANTIA_PHY=m
CONFIG_AR5523=m
CONFIG_ARC_EMAC=m
+# CONFIG_ARCH_TEGRA_186_SOC is not set
# CONFIG_ARCNET is not set
# CONFIG_ARM64_PTDUMP is not set
# CONFIG_ARM64_SW_TTBR0_PAN is not set
# CONFIG_ARM_ARCH_TIMER_EVTSTREAM is not set
+CONFIG_ARM_PSCI_CHECKER=y
# CONFIG_ARM_SCPI_PROTOCOL is not set
# CONFIG_AS3935 is not set
# CONFIG_ASYMMETRIC_KEY_TYPE is not set
@@ -793,6 +795,7 @@ CONFIG_CRYPTO_DES_S390=m
CONFIG_CRYPTO_DEV_CHELSIO=m
CONFIG_CRYPTO_DEV_HIFN_795X=m
CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y
+CONFIG_CRYPTO_DEV_VIRTIO=m
CONFIG_CRYPTO_DH=m
CONFIG_CRYPTO_DRBG_CTR=y
CONFIG_CRYPTO_DRBG_HASH=y
@@ -1680,10 +1683,13 @@ CONFIG_I2C_DIOLAN_U2C=m
# CONFIG_I2C_HELPER_AUTO is not set
CONFIG_I2C_HID=m
# CONFIG_I2C_I801 is not set
+CONFIG_I2C_IMX_LPI2C=m
# CONFIG_I2C_ISCH is not set
# CONFIG_I2C is not set
+CONFIG_I2C_MLXCPLD=m
# CONFIG_I2C_MUX_GPIO is not set
# CONFIG_I2C_MUX is not set
+CONFIG_I2C_MUX_MLXCPLD=m
# CONFIG_I2C_MUX_PCA9541 is not set
# CONFIG_I2C_MUX_PCA954x is not set
# CONFIG_I2C_MUX_PINCTRL is not set
@@ -1695,6 +1701,8 @@ CONFIG_I2C_HID=m
# CONFIG_I2C_PARPORT_LIGHT is not set
CONFIG_I2C_PCA_PLATFORM=m
# CONFIG_I2C_PIIX4 is not set
+CONFIG_I2C_PXA=m
+# CONFIG_I2C_PXA_SLAVE is not set
# CONFIG_I2C_RK3X is not set
# CONFIG_I2C_ROBOTFUZZ_OSIF is not set
CONFIG_I2C_SI470X=m
@@ -1824,6 +1832,7 @@ CONFIG_INFINIBAND_SRPT=m
CONFIG_INFINIBAND_USER_ACCESS=m
CONFIG_INFINIBAND_USER_MAD=m
CONFIG_INFINIBAND_USNIC=m
+CONFIG_INFINIBAND_VMWARE_PVRDMA=m
# CONFIG_INFTL is not set
CONFIG_INITRAMFS_SOURCE=""
CONFIG_INOTIFY_USER=y
@@ -2629,6 +2638,7 @@ CONFIG_MLX5_CORE_EN=y
CONFIG_MLX5_CORE=m
CONFIG_MLX5_INFINIBAND=m
# CONFIG_MLX90614 is not set
+CONFIG_MLX_CPLD_PLATFORM=m
CONFIG_MLXSW_CORE_HWMON=y
CONFIG_MLXSW_CORE=m
CONFIG_MLXSW_CORE_THERMAL=y
@@ -3536,6 +3546,7 @@ CONFIG_PSTORE=y
# CONFIG_PTP_1588_CLOCK is not set
CONFIG_PTP_1588_CLOCK_PCH=m
# CONFIG_PWM_FSL_FTM is not set
+CONFIG_PWM_HIBVT=m
# CONFIG_PWM_PCA9685 is not set
CONFIG_PWM=y
# CONFIG_PWRSEQ_EMMC is not set
@@ -4427,8 +4438,8 @@ CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
CONFIG_SND_SOC=m
# CONFIG_SND_SOC_MAX98504 is not set
# CONFIG_SND_SOC_MAX9860 is not set
-CONFIG_SND_SOC_MSM8916_WCD_ANALOG=m
-CONFIG_SND_SOC_MSM8916_WCD_DIGITAL=m
+# CONFIG_SND_SOC_MSM8916_WCD_ANALOG is not set
+# CONFIG_SND_SOC_MSM8916_WCD_DIGITAL 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
@@ -4674,6 +4685,8 @@ CONFIG_TCP_CONG_YEAH=m
CONFIG_TCP_MD5SIG=y
# CONFIG_TCS3414 is not set
# CONFIG_TCS3472 is not set
+CONFIG_TEGRA_GMI=m
+CONFIG_TEGRA_IVC=y
CONFIG_TEHUTI=m
CONFIG_TEKRAM_DONGLE=m
CONFIG_TELCLOCK=m
@@ -4726,6 +4739,7 @@ CONFIG_TIMER_STATS=y
CONFIG_TIPC=m
# CONFIG_TIPC_MEDIA_IB is not set
CONFIG_TIPC_MEDIA_UDP=y
+CONFIG_TI_SCI_PROTOCOL=m
# CONFIG_TI_ST is not set
# CONFIG_TI_SYSCON_RESET is not set
CONFIG_TLAN=m
@@ -4838,6 +4852,7 @@ CONFIG_TUN=m
CONFIG_TYPHOON=m
CONFIG_UBIFS_ATIME_SUPPORT=y
# CONFIG_UBIFS_FS_ADVANCED_COMPR is not set
+CONFIG_UBIFS_FS_ENCRYPTION=y
CONFIG_UBIFS_FS=m
# CONFIG_UBSAN_ALIGNMENT is not set
# CONFIG_UBSAN is not set