diff options
| author | Peter Robinson <pbrobinson@gmail.com> | 2017-05-10 18:20:47 +0100 |
|---|---|---|
| committer | Peter Robinson <pbrobinson@gmail.com> | 2017-05-10 18:20:47 +0100 |
| commit | ed622fefe80435df0a0a56f2371cd1b024b7ac82 (patch) | |
| tree | 72abfd2228cd63207f29b4cb743e38f19ae06376 /kernel-i686.config | |
| parent | 48953e19ba24578846ec4aebbbbc0b89ff539b4c (diff) | |
| download | kernel-ed622fefe80435df0a0a56f2371cd1b024b7ac82.tar.gz kernel-ed622fefe80435df0a0a56f2371cd1b024b7ac82.tar.xz kernel-ed622fefe80435df0a0a56f2371cd1b024b7ac82.zip | |
minor merge window cleanups
Diffstat (limited to 'kernel-i686.config')
| -rw-r--r-- | kernel-i686.config | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/kernel-i686.config b/kernel-i686.config index d553b5f8f..afc299078 100644 --- a/kernel-i686.config +++ b/kernel-i686.config @@ -843,7 +843,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_CCP_CRYPTO=m CONFIG_CRYPTO_DEV_CCP_DD=m CONFIG_CRYPTO_DEV_CCP=y @@ -1293,9 +1292,7 @@ CONFIG_EDAC_I82875P=m CONFIG_EDAC_I82975X=m CONFIG_EDAC_IE31200=m CONFIG_EDAC_LEGACY_SYSFS=y -CONFIG_EDAC_MM_EDAC=m CONFIG_EDAC_R82600=m -# CONFIG_EDAC_SBRIDGE is not set CONFIG_EDAC_X38=m CONFIG_EDAC=y CONFIG_EDD=m @@ -2636,7 +2633,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 |