From: Jonas Gorski <jogo@openwrt.org>
Date: Fri, 19 Jul 2013 22:58:01 +0000 (+0000)
Subject: kernel: move CONFIG_NET_IP_TUNNEL to generic
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=b1b4e7db138fc9cd0e589121c715f2041dd3a3ed;p=librecmc%2Flibrecmc.git

kernel: move CONFIG_NET_IP_TUNNEL to generic

Signed-off-by: Jonas Gorski <jogo@openwrt.org>

SVN-Revision: 37465
---

diff --git a/target/linux/ar71xx/config-3.10 b/target/linux/ar71xx/config-3.10
index 31a1db1c4d..8695bad1f7 100644
--- a/target/linux/ar71xx/config-3.10
+++ b/target/linux/ar71xx/config-3.10
@@ -216,7 +216,6 @@ CONFIG_NET_DSA=y
 CONFIG_NET_DSA_MV88E6060=y
 CONFIG_NET_DSA_MV88E6063=y
 CONFIG_NET_DSA_TAG_TRAILER=y
-# CONFIG_NET_IP_TUNNEL is not set
 CONFIG_NO_GENERIC_PCI_IOPORT_MAP=y
 CONFIG_PAGEFLAGS_EXTENDED=y
 CONFIG_PCI=y
diff --git a/target/linux/bcm53xx/config-3.10 b/target/linux/bcm53xx/config-3.10
index 6d1017f147..4bcb3088ff 100644
--- a/target/linux/bcm53xx/config-3.10
+++ b/target/linux/bcm53xx/config-3.10
@@ -152,7 +152,6 @@ CONFIG_MTD_OF_PARTS=y
 CONFIG_MULTI_IRQ_HANDLER=y
 CONFIG_MUTEX_SPIN_ON_OWNER=y
 CONFIG_NEED_DMA_MAP_STATE=y
-# CONFIG_NET_IP_TUNNEL is not set
 CONFIG_NR_CPUS=4
 CONFIG_OF=y
 CONFIG_OF_ADDRESS=y
diff --git a/target/linux/brcm47xx/config-3.10 b/target/linux/brcm47xx/config-3.10
index bf58325e79..df5eaef505 100644
--- a/target/linux/brcm47xx/config-3.10
+++ b/target/linux/brcm47xx/config-3.10
@@ -113,7 +113,6 @@ CONFIG_MTD_PHYSMAP=y
 # CONFIG_MTD_SM_COMMON is not set
 CONFIG_NEED_DMA_MAP_STATE=y
 CONFIG_NEED_PER_CPU_KM=y
-# CONFIG_NET_IP_TUNNEL is not set
 CONFIG_NO_EXCEPT_FILL=y
 CONFIG_NO_GENERIC_PCI_IOPORT_MAP=y
 CONFIG_PAGEFLAGS_EXTENDED=y
diff --git a/target/linux/generic/config-3.10 b/target/linux/generic/config-3.10
index 628513e9e0..5120c8d272 100644
--- a/target/linux/generic/config-3.10
+++ b/target/linux/generic/config-3.10
@@ -2002,6 +2002,7 @@ CONFIG_NET_IPGRE_BROADCAST=y
 # CONFIG_NET_IPGRE_DEMUX is not set
 # CONFIG_NET_IPIP is not set
 # CONFIG_NET_IPVTI is not set
+# CONFIG_NET_IP_TUNNEL is not set
 # CONFIG_NET_ISA is not set
 # CONFIG_NET_KEY is not set
 # CONFIG_NET_KEY_MIGRATE is not set
diff --git a/target/linux/imx23/config-default b/target/linux/imx23/config-default
index d258c8886a..7c5f35983c 100644
--- a/target/linux/imx23/config-default
+++ b/target/linux/imx23/config-default
@@ -177,7 +177,6 @@ CONFIG_MXS_DMA=y
 CONFIG_NEED_DMA_MAP_STATE=y
 CONFIG_NEED_PER_CPU_KM=y
 # CONFIG_NET_DMA is not set
-# CONFIG_NET_IP_TUNNEL is not set
 CONFIG_NLS=y
 CONFIG_OF=y
 CONFIG_OF_ADDRESS=y
diff --git a/target/linux/imx6/config-3.10 b/target/linux/imx6/config-3.10
index a5982f73b5..7b07d62c0f 100644
--- a/target/linux/imx6/config-3.10
+++ b/target/linux/imx6/config-3.10
@@ -225,7 +225,6 @@ CONFIG_MX3_IPU_IRQS=4
 CONFIG_MXS_DMA=y
 CONFIG_NEED_DMA_MAP_STATE=y
 # CONFIG_NET_DMA is not set
-# CONFIG_NET_IP_TUNNEL is not set
 CONFIG_NLS=y
 CONFIG_NLS_CODEPAGE_437=y
 CONFIG_NO_HZ_COMMON=y
diff --git a/target/linux/ixp4xx/config-3.10 b/target/linux/ixp4xx/config-3.10
index 89cc7476c6..89933e37ea 100644
--- a/target/linux/ixp4xx/config-3.10
+++ b/target/linux/ixp4xx/config-3.10
@@ -180,7 +180,6 @@ CONFIG_MTD_REDBOOT_PARTS=y
 CONFIG_NEED_DMA_MAP_STATE=y
 CONFIG_NEED_MACH_IO_H=y
 CONFIG_NEED_PER_CPU_KM=y
-# CONFIG_NET_IP_TUNNEL is not set
 CONFIG_NET_VENDOR_XSCALE=y
 CONFIG_OLD_SIGACTION=y
 CONFIG_OLD_SIGSUSPEND3=y
diff --git a/target/linux/ramips/mt7620a/config-3.10 b/target/linux/ramips/mt7620a/config-3.10
index 9d6d64262f..17596b1138 100644
--- a/target/linux/ramips/mt7620a/config-3.10
+++ b/target/linux/ramips/mt7620a/config-3.10
@@ -112,7 +112,6 @@ CONFIG_MTD_PHYSMAP_OF=y
 CONFIG_MTD_UIMAGE_SPLIT=y
 CONFIG_NEED_DMA_MAP_STATE=y
 CONFIG_NEED_PER_CPU_KM=y
-# CONFIG_NET_IP_TUNNEL is not set
 CONFIG_NET_RALINK=y
 CONFIG_NET_RALINK_GSW_MT7620=y
 CONFIG_NET_RALINK_MDIO=y
diff --git a/target/linux/ramips/rt305x/config-3.10 b/target/linux/ramips/rt305x/config-3.10
index 90885390c9..809f136764 100644
--- a/target/linux/ramips/rt305x/config-3.10
+++ b/target/linux/ramips/rt305x/config-3.10
@@ -102,7 +102,6 @@ CONFIG_MTD_PHYSMAP_OF=y
 CONFIG_MTD_UIMAGE_SPLIT=y
 CONFIG_NEED_DMA_MAP_STATE=y
 CONFIG_NEED_PER_CPU_KM=y
-# CONFIG_NET_IP_TUNNEL is not set
 CONFIG_NET_RALINK=y
 CONFIG_NET_RALINK_ESW_RT3052=y
 CONFIG_OF=y
diff --git a/target/linux/ramips/rt3883/config-3.10 b/target/linux/ramips/rt3883/config-3.10
index 36a308d353..e99d3ac2b4 100644
--- a/target/linux/ramips/rt3883/config-3.10
+++ b/target/linux/ramips/rt3883/config-3.10
@@ -103,7 +103,6 @@ CONFIG_MTD_PHYSMAP_OF=y
 CONFIG_MTD_UIMAGE_SPLIT=y
 CONFIG_NEED_DMA_MAP_STATE=y
 CONFIG_NEED_PER_CPU_KM=y
-# CONFIG_NET_IP_TUNNEL is not set
 CONFIG_NET_RALINK=y
 CONFIG_NET_RALINK_MDIO=y
 CONFIG_NET_RALINK_MDIO_RT2880=y