diff options
author | Russell King <rmk+kernel@armlinux.org.uk> | 2017-09-09 17:34:41 +0200 |
---|---|---|
committer | Russell King <rmk+kernel@armlinux.org.uk> | 2017-09-09 17:34:41 +0200 |
commit | e558bdc21ae1f0db520eccd84015e17d8a589973 (patch) | |
tree | b436123bd52f267b8c7f361618cded3e1e4421ea /arch/arm/configs/efm32_defconfig | |
parent | ARM: 8692/1: mm: abort uaccess retries upon fatal signal (diff) | |
parent | ARM: 8691/1: Export save_stack_trace_tsk() (diff) | |
download | linux-e558bdc21ae1f0db520eccd84015e17d8a589973.tar.xz linux-e558bdc21ae1f0db520eccd84015e17d8a589973.zip |
Merge branches 'fixes' and 'misc' into for-linus
Diffstat (limited to 'arch/arm/configs/efm32_defconfig')
-rw-r--r-- | arch/arm/configs/efm32_defconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/configs/efm32_defconfig b/arch/arm/configs/efm32_defconfig index c0dac0f0f804..860d27138e6f 100644 --- a/arch/arm/configs/efm32_defconfig +++ b/arch/arm/configs/efm32_defconfig @@ -38,7 +38,6 @@ CONFIG_INET=y # CONFIG_INET_XFRM_MODE_TRANSPORT is not set # CONFIG_INET_XFRM_MODE_TUNNEL is not set # CONFIG_INET_XFRM_MODE_BEET is not set -# CONFIG_INET_LRO is not set # CONFIG_INET_DIAG is not set # CONFIG_IPV6 is not set # CONFIG_WIRELESS is not set |