summaryrefslogtreecommitdiffstats
path: root/kernel-ppc64p7-debug.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-ppc64p7-debug.config
parent48953e19ba24578846ec4aebbbbc0b89ff539b4c (diff)
downloadkernel-ed622fefe80435df0a0a56f2371cd1b024b7ac82.tar.gz
kernel-ed622fefe80435df0a0a56f2371cd1b024b7ac82.tar.xz
kernel-ed622fefe80435df0a0a56f2371cd1b024b7ac82.zip
minor merge window cleanups
Diffstat (limited to 'kernel-ppc64p7-debug.config')
-rw-r--r--kernel-ppc64p7-debug.config3
1 files changed, 0 insertions, 3 deletions
diff --git a/kernel-ppc64p7-debug.config b/kernel-ppc64p7-debug.config
index 5e0d46cb1..881567af9 100644
--- a/kernel-ppc64p7-debug.config
+++ b/kernel-ppc64p7-debug.config
@@ -785,7 +785,6 @@ CONFIG_CRYPTO_CTR=y
CONFIG_CRYPTO_CTS=y
CONFIG_CRYPTO_DEFLATE=m
CONFIG_CRYPTO_DES=m
-# CONFIG_CRYPTO_DEV_CAVIUM_ZIP is not set
# CONFIG_CRYPTO_DEV_CCREE is not set
CONFIG_CRYPTO_DEV_CHELSIO=m
# CONFIG_CRYPTO_DEV_FSL_CAAM is not set
@@ -1194,7 +1193,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_MPC85XX is not set
CONFIG_EDAC=y
CONFIG_EEPROM_93CX6=m
@@ -2454,7 +2452,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