From: Florian Fainelli <florian@openwrt.org>
Date: Mon, 6 Jul 2009 10:52:15 +0000 (+0000)
Subject: avoid overriding CONFIG_TUN with a couple of targets
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=8d91123a0f425cf7f0952ab42041e90f4a4acaa0;p=lede.git

avoid overriding CONFIG_TUN with a couple of targets

SVN-Revision: 16705
---

diff --git a/target/linux/iop32x/config-default b/target/linux/iop32x/config-default
index e92649fa1e..7f4eb7b4c6 100644
--- a/target/linux/iop32x/config-default
+++ b/target/linux/iop32x/config-default
@@ -187,7 +187,6 @@ CONFIG_SLABINFO=y
 CONFIG_SPLIT_PTLOCK_CPUS=4096
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
 # CONFIG_TICK_ONESHOT is not set
-# CONFIG_TUN is not set
 CONFIG_UID16=y
 CONFIG_USB=m
 # CONFIG_USB_ACM is not set
diff --git a/target/linux/olpc/config-2.6.27 b/target/linux/olpc/config-2.6.27
index 2f1f9d321a..dd1b708337 100644
--- a/target/linux/olpc/config-2.6.27
+++ b/target/linux/olpc/config-2.6.27
@@ -541,7 +541,6 @@ CONFIG_THERMAL=y
 CONFIG_TICK_ONESHOT=y
 CONFIG_TIMER_STATS=y
 # CONFIG_TOSHIBA is not set
-# CONFIG_TUN is not set
 # CONFIG_UDF_FS is not set
 CONFIG_UID16=y
 CONFIG_USB=y
diff --git a/target/linux/orion/config-default b/target/linux/orion/config-default
index 10ec353914..b370b1048b 100644
--- a/target/linux/orion/config-default
+++ b/target/linux/orion/config-default
@@ -210,7 +210,6 @@ CONFIG_SLABINFO=y
 CONFIG_SPLIT_PTLOCK_CPUS=4096
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
 CONFIG_TICK_ONESHOT=y
-# CONFIG_TUN is not set
 CONFIG_UID16=y
 CONFIG_USB=m
 # CONFIG_USBPCWATCHDOG is not set
diff --git a/target/linux/pxa/config-default b/target/linux/pxa/config-default
index eb0770fd59..1e61659203 100644
--- a/target/linux/pxa/config-default
+++ b/target/linux/pxa/config-default
@@ -220,7 +220,6 @@ CONFIG_SYS_SUPPORTS_APM_EMULATION=y
 # CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set
 # CONFIG_TOUCHSCREEN_TOUCHWIN is not set
 CONFIG_TOUCHSCREEN_UCB1400=m
-# CONFIG_TUN is not set
 # CONFIG_UDF_FS is not set
 CONFIG_UID16=y
 CONFIG_UNIX=m