Patched in Tegra support.

1 files changed, 2 insertions, 18 deletions

diff --git a/net/ipv6/Kconfig b/net/ipv6/Kconfig
index 4f7fe7270e3..36d7437ac05 100644
--- a/net/ipv6/Kconfig
+++ b/net/ipv6/Kconfig
@@ -69,7 +69,7 @@ config IPV6_OPTIMISTIC_DAD
 
 config INET6_AH
         tristate "IPv6: AH transformation"
-        select XFRM_ALGO
+        select XFRM
         select CRYPTO
         select CRYPTO_HMAC
         select CRYPTO_MD5
@@ -81,7 +81,7 @@ config INET6_AH
 
 config INET6_ESP
         tristate "IPv6: ESP transformation"
-        select XFRM_ALGO
+        select XFRM
         select CRYPTO
         select CRYPTO_AUTHENC
         select CRYPTO_HMAC
@@ -201,22 +201,6 @@ config IPV6_TUNNEL
 
           If unsure, say N.
 
-config IPV6_GRE
-        tristate "IPv6: GRE tunnel"
-        select IPV6_TUNNEL
-        ---help---
-          Tunneling means encapsulating data of one protocol type within
-          another protocol and sending it over a channel that understands the
-          encapsulating protocol. This particular tunneling driver implements
-          GRE (Generic Routing Encapsulation) and at this time allows
-          encapsulating of IPv4 or IPv6 over existing IPv6 infrastructure.
-          This driver is useful if the other endpoint is a Cisco router: Cisco
-          likes GRE much better than the other Linux tunneling driver ("IP
-          tunneling" above). In addition, GRE allows multicast redistribution
-          through the tunnel.
-
-          Saying M here will produce a module called ip6_gre. If unsure, say N.
-
 config IPV6_MULTIPLE_TABLES
         bool "IPv6: Multiple Routing Tables"
         depends on EXPERIMENTAL