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 31a1db1c4db6ddc63c1f81187ddfb301092cbcab..8695bad1f74d7b00c749ca60cbafe47ab5b4d609 100644 (file)
--- 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 6d1017f147b1d13170641f13f4d4fff6687f3254..4bcb3088ff28eeb37693eefe240178229a22e404 100644 (file)
--- 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 bf58325e79b40989a6d8125a7859827915b5c7ee..df5eaef50567b7e6e211640e3e9c150ab67286cb 100644 (file)
--- 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 628513e9e050c15b476af989eaa83c1f4925bfdd..5120c8d2725e879a857194f246d37b7aaadbd928 100644 (file)
--- 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 d258c8886a12021e747b44cce02ec8bc232003af..7c5f35983c4ff51ab79630961b4f980cf2243ec3 100644 (file)
--- 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 a5982f73b577c2913e8e2c577c4f5f736ec3ea11..7b07d62c0f6a650f714a75400d1c7f2fb7187f73 100644 (file)
--- 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 89cc7476c6d91ad6bfd6d9758715a7bfabedab51..89933e37ea5980a539801a94cd1ea7cf161516be 100644 (file)
--- 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 9d6d64262f00c658ce2ddb3258982aa3008f522c..17596b1138d69b4090c80179c6264035157ff980 100644 (file)
--- 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 90885390c9ee24429d6956195526aeddb113a981..809f13676446a18f48b29033767fe5c41d797bd4 100644 (file)
--- 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 36a308d35318a3168e97f6b8ceb0e2280d214ac4..e99d3ac2b4fb27589378088e187f197c0bef184f 100644 (file)
--- 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