From: Dmitry Shmidt <dimitrysh@google.com>
Date: Fri, 1 Oct 2010 17:24:14 +0000 (-0700)
Subject: Revert "ARM: stingray: config: Enable L2TP"
X-Git-Tag: firefly_0821_release~9834^2~487
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=0b848bdb75a2825aa4a890dc36cdc3d75fff1aee;p=firefly-linux-kernel-4.4.55.git

Revert "ARM: stingray: config: Enable L2TP"

This reverts commit 3abb283928938e44cc8764fdbc5e90d5f6022dac.
---

diff --git a/arch/arm/configs/stingray_defconfig b/arch/arm/configs/stingray_defconfig
index 51d595f1fab7..6ec296c99489 100644
--- a/arch/arm/configs/stingray_defconfig
+++ b/arch/arm/configs/stingray_defconfig
@@ -655,10 +655,7 @@ CONFIG_IP_NF_ARP_MANGLE=y
 # CONFIG_RDS is not set
 # CONFIG_TIPC is not set
 # CONFIG_ATM is not set
-CONFIG_L2TP=y
-CONFIG_L2TP_V3=y
-CONFIG_L2TP_IP=y
-CONFIG_L2TP_ETH=y
+# CONFIG_L2TP is not set
 # CONFIG_BRIDGE is not set
 # CONFIG_NET_DSA is not set
 # CONFIG_VLAN_8021Q is not set