summaryrefslogtreecommitdiffstats
path: root/kernel-s390x.config
diff options
context:
space:
mode:
authorPeter Robinson <pbrobinson@gmail.com>2016-12-27 02:51:37 +0000
committerPeter Robinson <pbrobinson@gmail.com>2016-12-27 02:51:37 +0000
commite686a652a26851e0feb9467b872378f1b6bcb80e (patch)
treef2c83a9980ac4a983561caf0e9eb2f0a00402263 /kernel-s390x.config
parentd9bf1c02937ca02309c3a0305e4fd6b39ee464ff (diff)
downloadkernel-e686a652a26851e0feb9467b872378f1b6bcb80e.tar.gz
kernel-e686a652a26851e0feb9467b872378f1b6bcb80e.tar.xz
kernel-e686a652a26851e0feb9467b872378f1b6bcb80e.zip
Linux v4.10-rc1 (didn't adjust debug options), ARM config updates, minor general config cleanups
Diffstat (limited to 'kernel-s390x.config')
-rw-r--r--kernel-s390x.config34
1 files changed, 21 insertions, 13 deletions
diff --git a/kernel-s390x.config b/kernel-s390x.config
index 8a24c28a3..4ddada7af 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -184,7 +184,6 @@ CONFIG_AR5523=m
# 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
@@ -284,7 +283,6 @@ CONFIG_AUTOFS4_FS=y
# CONFIG_AVERAGE is not set
CONFIG_AX25_DAMA_SLAVE=y
CONFIG_AX25=m
-# CONFIG_AXP20X_POWER is not set
CONFIG_B43_BCMA_PIO=y
CONFIG_B43_BCMA=y
CONFIG_B43_DEBUG=y
@@ -434,7 +432,7 @@ CONFIG_BMC150_ACCEL=m
# CONFIG_BMG160 is not set
# CONFIG_BMI160_I2C is not set
# CONFIG_BMI160_SPI is not set
-# CONFIG_BMP280 is not set
+CONFIG_BMP280=m
CONFIG_BNA=m
CONFIG_BNX2=m
CONFIG_BNX2X=m
@@ -649,7 +647,6 @@ CONFIG_CGROUPS=y
# CONFIG_CHARGER_QCOM_SMBB is not set
# CONFIG_CHARGER_RT9455 is not set
CONFIG_CHARGER_SMB347=m
-# CONFIG_CHARGER_TPS65217 is not set
# CONFIG_CHECKPOINT_RESTORE is not set
CONFIG_CHECK_STACK=y
CONFIG_CHELSIO_T1_1G=y
@@ -845,6 +842,7 @@ CONFIG_CRYPTO_SHA3=m
CONFIG_CRYPTO_SHA512_ARM64=m
CONFIG_CRYPTO_SHA512=m
CONFIG_CRYPTO_SHA512_S390=m
+CONFIG_CRYPTO_SIMD=y
CONFIG_CRYPTO_TEA=m
CONFIG_CRYPTO_TEST=m
CONFIG_CRYPTO_TGR192=m
@@ -1367,6 +1365,7 @@ CONFIG_FSCACHE_STATS=y
CONFIG_FS_DAX=y
CONFIG_FS_ENCRYPTION=y
# CONFIG_FSL_EDMA is not set
+# CONFIG_FSL_PQ_MDIO is not set
CONFIG_FS_MBCACHE=y
CONFIG_FSNOTIFY=y
# CONFIG_FTL is not set
@@ -1451,9 +1450,8 @@ CONFIG_GPIOLIB=y
# CONFIG_GPIO_SCH is not set
# CONFIG_GPIO_SX150X is not set
# CONFIG_GPIO_SYSCON is not set
-CONFIG_GPIO_SYSFS=y
+# CONFIG_GPIO_SYSFS is not set
# CONFIG_GPIO_TPIC2810 is not set
-# CONFIG_GPIO_TPS65218 is not set
# CONFIG_GPIO_TS4900 is not set
# CONFIG_GPIO_TS5500 is not set
CONFIG_GPIO_VIPERBOARD=m
@@ -2324,7 +2322,6 @@ CONFIG_LEDS_NIC78BX=m
# CONFIG_LEDS_PCA9532 is not set
# CONFIG_LEDS_PCA955X is not set
# CONFIG_LEDS_PCA963X is not set
-# CONFIG_LEDS_PM8058 is not set
# CONFIG_LEDS_PWM is not set
CONFIG_LEDS_REGULATOR=m
# CONFIG_LEDS_S3C24XX is not set
@@ -2476,6 +2473,9 @@ CONFIG_MD_AUTODETECT=y
CONFIG_MD_FAULTY=m
CONFIG_MDIO_BCM_UNIMAC=m
CONFIG_MDIO_BITBANG=m
+# CONFIG_MDIO_BUS_MUX_GPIO is not set
+# CONFIG_MDIO_BUS_MUX is not set
+# CONFIG_MDIO_BUS_MUX_MMIOREG is not set
# CONFIG_MDIO_GPIO is not set
# CONFIG_MDIO_HISI_FEMAC is not set
# CONFIG_MDIO_OCTEON is not set
@@ -2492,7 +2492,6 @@ CONFIG_MEDIA_ANALOG_TV_SUPPORT=y
CONFIG_MEDIA_ATTACH=y
CONFIG_MEDIA_CAMERA_SUPPORT=y
CONFIG_MEDIA_CEC_DEBUG=y
-# CONFIG_MEDIA_CEC is not set
CONFIG_MEDIA_CEC_SUPPORT=y
# CONFIG_MEDIA_CONTROLLER_DVB is not set
CONFIG_MEDIA_CONTROLLER=y
@@ -2533,21 +2532,25 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
# CONFIG_MFD_88PM800 is not set
# CONFIG_MFD_88PM805 is not set
# CONFIG_MFD_88PM860X is not set
+# CONFIG_MFD_AAT2870_CORE is not set
# CONFIG_MFD_ACT8945A is not set
# CONFIG_MFD_ARIZONA_I2C is not set
# CONFIG_MFD_ARIZONA is not set
# CONFIG_MFD_ARIZONA_SPI is not set
+# CONFIG_MFD_AS3711 is not set
# CONFIG_MFD_AS3722 is not set
# CONFIG_MFD_ASIC3 is not set
# CONFIG_MFD_ATMEL_FLEXCOM is not set
# CONFIG_MFD_ATMEL_HLCDC is not set
# CONFIG_MFD_AXP20X_I2C is not set
-# CONFIG_MFD_AXP20X_RSB is not set
+# CONFIG_MFD_AXP20X is not set
# CONFIG_MFD_BCM590XX is not set
CONFIG_MFD_CORE=m
# CONFIG_MFD_CROS_EC is not set
# CONFIG_MFD_CS5535 is not set
+# CONFIG_MFD_DA9052_I2C is not set
# CONFIG_MFD_DA9052_SPI is not set
+# CONFIG_MFD_DA9055 is not set
# CONFIG_MFD_DA9062 is not set
# CONFIG_MFD_DA9063 is not set
# CONFIG_MFD_DA9150 is not set
@@ -2558,6 +2561,7 @@ CONFIG_MFD_CORE=m
# CONFIG_MFD_KEMPLD is not set
# CONFIG_MFD_LM3533 is not set
# CONFIG_MFD_LP3943 is not set
+# CONFIG_MFD_LP8788 is not set
# CONFIG_MFD_MAX14577 is not set
# CONFIG_MFD_MAX77620 is not set
# CONFIG_MFD_MAX77686 is not set
@@ -2573,7 +2577,7 @@ CONFIG_MFD_CORE=m
# CONFIG_MFD_MT6397 is not set
# CONFIG_MFD_PALMAS is not set
# CONFIG_MFD_PCF50633 is not set
-CONFIG_MFD_PM8XXX=m
+# CONFIG_MFD_RC5T583 is not set
# CONFIG_MFD_RDC321X is not set
# CONFIG_MFD_RETU is not set
# CONFIG_MFD_RK808 is not set
@@ -2581,10 +2585,12 @@ CONFIG_MFD_PM8XXX=m
# CONFIG_MFD_RT5033 is not set
# CONFIG_MFD_RTSX_PCI is not set
CONFIG_MFD_RTSX_USB=m
+# CONFIG_MFD_SEC_CORE is not set
# CONFIG_MFD_SI476X_CORE is not set
# CONFIG_MFD_SKY81452 is not set
CONFIG_MFD_SM501_GPIO=y
# CONFIG_MFD_SM501 is not set
+# CONFIG_MFD_SMSC is not set
# CONFIG_MFD_STMPE is not set
CONFIG_MFD_SUN4I_GPADC=m
# CONFIG_MFD_SYSCON is not set
@@ -3487,6 +3493,8 @@ CONFIG_PMBUS=m
CONFIG_PM_DEBUG=y
# CONFIG_PM_DEVFREQ_EVENT is not set
CONFIG_PM_DEVFREQ=y
+# CONFIG_PMIC_ADP5520 is not set
+# CONFIG_PMIC_DA903X is not set
# CONFIG_PM_OPP is not set
CONFIG_PM_STD_PARTITION=""
CONFIG_PM_TEST_SUSPEND=y
@@ -3570,6 +3578,7 @@ CONFIG_QCOM_ADSP_PIL=m
# CONFIG_QCOM_HIDMA_MGMT is not set
CONFIG_QDIO=m
CONFIG_QEDE=m
+CONFIG_QEDI=m
CONFIG_QED=m
CONFIG_QED_SRIOV=y
CONFIG_QETH_IPV6=y
@@ -4449,6 +4458,7 @@ CONFIG_SND_SOC_DMIC=m
# CONFIG_SND_SOC_FSL_SSI is not set
CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
# CONFIG_SND_SOC_GTM601 is not set
+CONFIG_SND_SOC_HDMI_CODEC=m
# CONFIG_SND_SOC_IMG is not set
# CONFIG_SND_SOC_IMX_AUDMUX is not set
# CONFIG_SND_SOC_IMX_ES8328 is not set
@@ -5378,7 +5388,7 @@ CONFIG_VXLAN=m
# CONFIG_VZ89X is not set
CONFIG_W1_CON=y
# CONFIG_W1 is not set
-CONFIG_W1_MASTER_DS1WM=m
+# CONFIG_W1_MASTER_DS1WM is not set
CONFIG_W1_MASTER_DS2482=m
CONFIG_W1_MASTER_DS2490=m
# CONFIG_W1_MASTER_GPIO is not set
@@ -5477,8 +5487,6 @@ CONFIG_XILINX_GMII2RGMII=m
CONFIG_XILLYBUS=m
# CONFIG_XILLYBUS_OF is not set
CONFIG_XILLYBUS_PCIE=m
-CONFIG_XZ_DEC_ARMTHUMB=y
-CONFIG_XZ_DEC_ARM=y
CONFIG_XZ_DEC_IA64=y
CONFIG_XZ_DEC_POWERPC=y
CONFIG_XZ_DEC_SPARC=y