aboutsummaryrefslogtreecommitdiffstats
path: root/patches/1735-nios2-defconfig-Cleanup-from-old-Kconfig-options.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/1735-nios2-defconfig-Cleanup-from-old-Kconfig-options.patch')
-rw-r--r--patches/1735-nios2-defconfig-Cleanup-from-old-Kconfig-options.patch44
1 files changed, 44 insertions, 0 deletions
diff --git a/patches/1735-nios2-defconfig-Cleanup-from-old-Kconfig-options.patch b/patches/1735-nios2-defconfig-Cleanup-from-old-Kconfig-options.patch
new file mode 100644
index 00000000000000..2422df60d7d7b2
--- /dev/null
+++ b/patches/1735-nios2-defconfig-Cleanup-from-old-Kconfig-options.patch
@@ -0,0 +1,44 @@
+From 33dcfde57024a478728069cf4b0f51d51e422306 Mon Sep 17 00:00:00 2001
+From: Krzysztof Kozlowski <krzk@kernel.org>
+Date: Sun, 11 Feb 2018 23:01:17 +0800
+Subject: [PATCH 1735/1795] nios2: defconfig: Cleanup from old Kconfig options
+
+Remove old, dead Kconfig option INET_LRO. It is gone since
+commit 7bbf3cae65b6 ("ipv4: Remove inet_lro library").
+
+Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
+Acked-by: Ley Foon Tan <ley.foon.tan@intel.com>
+(cherry picked from commit e0691ebb33c12084ef11b6b59228c004e19f59c8)
+Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
+---
+ arch/nios2/configs/10m50_defconfig | 1 -
+ arch/nios2/configs/3c120_defconfig | 1 -
+ 2 files changed, 2 deletions(-)
+
+diff --git a/arch/nios2/configs/10m50_defconfig b/arch/nios2/configs/10m50_defconfig
+index 8b2a30b3b34f..c601c8ff1ae6 100644
+--- a/arch/nios2/configs/10m50_defconfig
++++ b/arch/nios2/configs/10m50_defconfig
+@@ -33,7 +33,6 @@ CONFIG_IP_PNP_RARP=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_IPV6 is not set
+ # CONFIG_WIRELESS is not set
+ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+diff --git a/arch/nios2/configs/3c120_defconfig b/arch/nios2/configs/3c120_defconfig
+index 9451940678a0..fce33588d55c 100644
+--- a/arch/nios2/configs/3c120_defconfig
++++ b/arch/nios2/configs/3c120_defconfig
+@@ -35,7 +35,6 @@ CONFIG_IP_PNP_RARP=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_IPV6 is not set
+ # CONFIG_WIRELESS is not set
+ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+--
+2.19.0
+