summaryrefslogtreecommitdiff
path: root/arch/arm/configs/mxs_defconfig
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2017-06-23 10:57:59 +0300
committerArnd Bergmann <arnd@arndb.de>2017-06-23 10:57:59 +0300
commita4857add27d3e48b39e55269b616fe1b99ad3415 (patch)
treecc9b67eae560652da4b643df0762a1a32ae1d9dc /arch/arm/configs/mxs_defconfig
parent125370a9288fcc5ca09d64942fed44f73277c6c3 (diff)
parent794b77738c0dede15441209a56044fd67c48a200 (diff)
downloadlinux-a4857add27d3e48b39e55269b616fe1b99ad3415.tar.xz
Merge tag 'samsung-defconfig-4.13-2' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into next/defconfig
Pull "ARM defconfig cleanup" from Krzysztof Kozłowski: 1. Remove old Kconfig options from all ARM configs, 2. Update Samsung defconfigs to bring back options over time got disabled for some reason (configs were not updated along with the code), 3. Save defconfigs for Samsung. * tag 'samsung-defconfig-4.13-2' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux: ARM: tct_hammer_defconfig: Save defconfig ARM: s5pv210_defconfig: Save defconfig ARM: s3c6400_defconfig: Save defconfig ARM: mini2440_defconfig: Save defconfig ARM: s3c2410_defconfig: Save defconfig ARM: exynos_defconfig: Save defconfig ARM: s5pv210_defconfig: Bring back lost (but wanted) options ARM: s3c6400_defconfig: Bring back lost (but wanted) options ARM: s3c2410_defconfig: Bring back lost (but wanted) options ARM: tct_hammer_defconfig: Bring back lost (but wanted) options ARM: mini2440_defconfig: Bring back lost (but wanted) options ARM: defconfig: samsung: Re-order entries to match savedefconfig ARM: defconfig: Cleanup from old Kconfig options
Diffstat (limited to 'arch/arm/configs/mxs_defconfig')
-rw-r--r--arch/arm/configs/mxs_defconfig1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/configs/mxs_defconfig b/arch/arm/configs/mxs_defconfig
index aef2b54a691c..e5822ab01b7d 100644
--- a/arch/arm/configs/mxs_defconfig
+++ b/arch/arm/configs/mxs_defconfig
@@ -39,7 +39,6 @@ CONFIG_SYN_COOKIES=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_CAN=m