summaryrefslogtreecommitdiffstats
path: root/kernel-s390x.config
diff options
context:
space:
mode:
authorLaura Abbott <labbott@fedoraproject.org>2017-02-24 08:50:29 -0800
committerLaura Abbott <labbott@fedoraproject.org>2017-02-24 08:50:34 -0800
commit09145060e9dc0eee575be39f29db8f897ba41374 (patch)
treea1faadf703dd9cd6ce8dc5a0076e5b15d7c16d1f /kernel-s390x.config
parent3d652a572b4e31490e8e004b6c94d8df7a173870 (diff)
downloadkernel-09145060e9dc0eee575be39f29db8f897ba41374.tar.gz
kernel-09145060e9dc0eee575be39f29db8f897ba41374.tar.xz
kernel-09145060e9dc0eee575be39f29db8f897ba41374.zip
Linux v4.10-9579-gf1ef09f
Includes config options from yesterday that were missed
Diffstat (limited to 'kernel-s390x.config')
-rw-r--r--kernel-s390x.config13
1 files changed, 13 insertions, 0 deletions
diff --git a/kernel-s390x.config b/kernel-s390x.config
index 7b098f8cc..b6a370329 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -718,6 +718,7 @@ CONFIG_CODA_FS=m
# CONFIG_COMMON_CLK_SI514 is not set
# CONFIG_COMMON_CLK_SI5351 is not set
# CONFIG_COMMON_CLK_XLNX_CLKWZRD is not set
+# CONFIG_COMMON_RESET_HI3660 is not set
CONFIG_COMPACTION=y
# CONFIG_COMPAT_BRK is not set
CONFIG_COMPAT=y
@@ -762,6 +763,7 @@ CONFIG_CROSS_COMPILE=""
CONFIG_CROSS_MEMORY_ATTACH=y
CONFIG_CRYPTO_842=m
CONFIG_CRYPTO_AES_S390=m
+CONFIG_CRYPTO_AES_TI=m
CONFIG_CRYPTO_AES=y
CONFIG_CRYPTO_ANSI_CPRNG=m
CONFIG_CRYPTO_ANUBIS=m
@@ -1027,6 +1029,7 @@ CONFIG_DRM_ANALOGIX_ANX78XX=m
CONFIG_DRM_AST=m
CONFIG_DRM_BOCHS=m
CONFIG_DRM_CIRRUS_QEMU=m
+# CONFIG_DRM_DEBUG_MM_SELFTEST is not set
CONFIG_DRM_DP_AUX_CHARDEV=y
# CONFIG_DRM_DUMB_VGA_DAC is not set
CONFIG_DRM_DW_HDMI_I2S_AUDIO=m
@@ -1070,6 +1073,7 @@ CONFIG_DRM_RADEON_USERPTR=y
CONFIG_DRM_SIL_SII8620=m
# CONFIG_DRM_SIS is not set
# CONFIG_DRM_TDFX is not set
+# CONFIG_DRM_TINYDRM is not set
CONFIG_DRM_TI_TFP410=m
# CONFIG_DRM_TOSHIBA_TC358767 is not set
CONFIG_DRM_UDL=m
@@ -1437,6 +1441,7 @@ CONFIG_GIRBIL_DONGLE=m
# CONFIG_GPIO_AMDPT is not set
# CONFIG_GPIO_BT8XX is not set
# CONFIG_GPIO_DWAPB is not set
+CONFIG_GPIO_EXAR=m
# CONFIG_GPIO_GENERIC_PLATFORM is not set
# CONFIG_GPIO_GRGPIO is not set
# CONFIG_GPIO_IT87 is not set
@@ -1451,6 +1456,7 @@ CONFIG_GPIOLIB=y
# CONFIG_GPIO_PCA953X is not set
# CONFIG_GPIO_PCF857X is not set
# CONFIG_GPIO_PCH is not set
+CONFIG_GPIO_PCI_IDIO_16=m
# CONFIG_GPIO_PISOSR is not set
# CONFIG_GPIO_RDC321X is not set
# CONFIG_GPIO_SCH311X is not set
@@ -1812,6 +1818,7 @@ CONFIG_INET_XFRM_MODE_BEET=m
CONFIG_INET_XFRM_MODE_TRANSPORT=m
CONFIG_INET_XFRM_MODE_TUNNEL=m
CONFIG_INET=y
+# CONFIG_INFINIBAND_BNXT_RE is not set
# CONFIG_INFINIBAND_CXGB3_DEBUG is not set
CONFIG_INFINIBAND_CXGB3=m
CONFIG_INFINIBAND_CXGB4=m
@@ -2242,6 +2249,7 @@ CONFIG_KEYBOARD_PMIC8XXX=m
# CONFIG_KEYBOARD_SUNKBD is not set
# CONFIG_KEYBOARD_TCA6416 is not set
# CONFIG_KEYBOARD_TCA8418 is not set
+CONFIG_KEYBOARD_TM2_TOUCHKEY=m
# CONFIG_KEYBOARD_XTKBD is not set
CONFIG_KEY_DH_OPERATIONS=y
CONFIG_KEYS=y
@@ -2557,6 +2565,7 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
# CONFIG_MFD_AXP20X is not set
# CONFIG_MFD_BCM590XX is not set
CONFIG_MFD_CORE=m
+CONFIG_MFD_CPCAP=m
# CONFIG_MFD_CROS_EC is not set
# CONFIG_MFD_CS5535 is not set
# CONFIG_MFD_DA9052_I2C is not set
@@ -3700,6 +3709,7 @@ CONFIG_REALTEK_AUTOPM=y
CONFIG_REALTEK_PHY=m
CONFIG_REGMAP_I2C=m
CONFIG_REGMAP=y
+CONFIG_REGULATOR_CPCAP=m
# CONFIG_REGULATOR_DEBUG is not set
# CONFIG_REGULATOR is not set
# CONFIG_REISERFS_CHECK is not set
@@ -4579,9 +4589,11 @@ CONFIG_SND_VIA82XX_MODEM=m
CONFIG_SND_VIRMIDI=m
CONFIG_SND_VIRTUOSO=m
CONFIG_SND_VX222=m
+CONFIG_SND_X86=m
CONFIG_SND_YMFPCI=m
# CONFIG_SOC_CAMERA is not set
# CONFIG_SOC_TI is not set
+# CONFIG_SOC_ZTE is not set
CONFIG_SOFT_WATCHDOG=m
CONFIG_SOLARIS_X86_PARTITION=y
# CONFIG_SOLO6X10 is not set
@@ -4887,6 +4899,7 @@ CONFIG_TOUCHSCREEN_WACOM_I2C=m
CONFIG_TOUCHSCREEN_WACOM_W8001=m
# CONFIG_TOUCHSCREEN_WDT87XX_I2C is not set
# CONFIG_TOUCHSCREEN_WM97XX is not set
+CONFIG_TOUCHSCREEN_ZET6223=m
CONFIG_TOUCHSCREEN_ZFORCE=m
# CONFIG_TPL0102 is not set
# CONFIG_TPS6105X is not set