aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/bcm53xx
diff options
context:
space:
mode:
authorJonas Gorski <jogo@openwrt.org>2013-07-19 22:58:01 +0000
committerJonas Gorski <jogo@openwrt.org>2013-07-19 22:58:01 +0000
commit184460f01ee9de7c49fdd7fff8cf1776caf3b529 (patch)
tree927de2cb182c38430663d8490fc19c309fdc98b3 /target/linux/bcm53xx
parentd959aa2e755f7fc859afeac7ca62d7aa0332fd76 (diff)
downloadupstream-184460f01ee9de7c49fdd7fff8cf1776caf3b529.tar.gz
upstream-184460f01ee9de7c49fdd7fff8cf1776caf3b529.tar.bz2
upstream-184460f01ee9de7c49fdd7fff8cf1776caf3b529.zip
kernel: move CONFIG_NET_IP_TUNNEL to generic
Signed-off-by: Jonas Gorski <jogo@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37465 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/bcm53xx')
-rw-r--r--target/linux/bcm53xx/config-3.101
1 files changed, 0 insertions, 1 deletions
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