summaryrefslogtreecommitdiffstats
path: root/kernel-s390x.config
diff options
context:
space:
mode:
authorPeter Robinson <pbrobinson@gmail.com>2017-05-10 18:20:47 +0100
committerPeter Robinson <pbrobinson@gmail.com>2017-05-10 18:20:47 +0100
commited622fefe80435df0a0a56f2371cd1b024b7ac82 (patch)
tree72abfd2228cd63207f29b4cb743e38f19ae06376 /kernel-s390x.config
parent48953e19ba24578846ec4aebbbbc0b89ff539b4c (diff)
downloadkernel-ed622fefe80435df0a0a56f2371cd1b024b7ac82.tar.gz
kernel-ed622fefe80435df0a0a56f2371cd1b024b7ac82.tar.xz
kernel-ed622fefe80435df0a0a56f2371cd1b024b7ac82.zip
minor merge window cleanups
Diffstat (limited to 'kernel-s390x.config')
-rw-r--r--kernel-s390x.config3
1 files changed, 0 insertions, 3 deletions
diff --git a/kernel-s390x.config b/kernel-s390x.config
index 1b84c7d7a..5c1134d27 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -781,7 +781,6 @@ CONFIG_CRYPTO_CTS=y
CONFIG_CRYPTO_DEFLATE=m
CONFIG_CRYPTO_DES=m
CONFIG_CRYPTO_DES_S390=m
-# CONFIG_CRYPTO_DEV_CAVIUM_ZIP is not set
# CONFIG_CRYPTO_DEV_CCREE is not set
CONFIG_CRYPTO_DEV_CHELSIO=m
CONFIG_CRYPTO_DEV_HIFN_795X=m
@@ -1176,7 +1175,6 @@ CONFIG_ECRYPT_FS=m
# CONFIG_EDAC_DEBUG is not set
CONFIG_EDAC_GHES=y
CONFIG_EDAC_LEGACY_SYSFS=y
-CONFIG_EDAC_MM_EDAC=m
CONFIG_EDAC=y
CONFIG_EEPROM_93CX6=m
# CONFIG_EEPROM_93XX46 is not set
@@ -2373,7 +2371,6 @@ CONFIG_LIRC_BT829=m
CONFIG_LIRC_IMON=m
CONFIG_LIRC=m
CONFIG_LIRC_PARALLEL=m
-CONFIG_LIRC_SASEM=m
CONFIG_LIRC_SERIAL=m
CONFIG_LIRC_SERIAL_TRANSMITTER=y
CONFIG_LIRC_SIR=m