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-x86_64.config | |
| parent | 48953e19ba24578846ec4aebbbbc0b89ff539b4c (diff) | |
| download | kernel-ed622fefe80435df0a0a56f2371cd1b024b7ac82.tar.gz kernel-ed622fefe80435df0a0a56f2371cd1b024b7ac82.tar.xz kernel-ed622fefe80435df0a0a56f2371cd1b024b7ac82.zip | |
minor merge window cleanups
Diffstat (limited to 'kernel-x86_64.config')
| -rw-r--r-- | kernel-x86_64.config | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/kernel-x86_64.config b/kernel-x86_64.config index c3a79ee47..7aeeb5e77 100644 --- a/kernel-x86_64.config +++ b/kernel-x86_64.config @@ -859,7 +859,6 @@ CONFIG_CRYPTO_CTS=y CONFIG_CRYPTO_DEFLATE=m CONFIG_CRYPTO_DES3_EDE_X86_64=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 @@ -1306,13 +1305,11 @@ CONFIG_ECRYPT_FS=m # CONFIG_ECRYPT_FS_MESSAGING is not set # CONFIG_EDAC_AMD64_ERROR_INJECTION is not set CONFIG_EDAC_AMD64=m -CONFIG_EDAC_AMD76X=m CONFIG_EDAC_AMD8111=m CONFIG_EDAC_AMD8131=m # CONFIG_EDAC_DEBUG is not set CONFIG_EDAC_DECODE_MCE=m CONFIG_EDAC_E752X=m -CONFIG_EDAC_E7XXX=m CONFIG_EDAC_GHES=y CONFIG_EDAC_I3000=m CONFIG_EDAC_I3200=m @@ -1321,14 +1318,10 @@ CONFIG_EDAC_I5100=m CONFIG_EDAC_I5400=m CONFIG_EDAC_I7300=m CONFIG_EDAC_I7CORE=m -CONFIG_EDAC_I82860=m -CONFIG_EDAC_I82875P=m CONFIG_EDAC_I82975X=m CONFIG_EDAC_IE31200=m CONFIG_EDAC_LEGACY_SYSFS=y -CONFIG_EDAC_MM_EDAC=m CONFIG_EDAC_PND2=m -CONFIG_EDAC_R82600=m CONFIG_EDAC_SBRIDGE=m CONFIG_EDAC_SKX=m CONFIG_EDAC_X38=m @@ -2676,7 +2669,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 |