[kernel] 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 e92649fa1e043a6c40df9050376e4502590e881c..7f4eb7b4c6da53a5b2ad2e8c2a9164c85c51384c 100644 (file)
--- 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 2f1f9d321aba759c0e3590a2ea1b093c1fdb8bb4..dd1b70833724c129b32c296358387cf16abd6098 100644 (file)
--- 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 10ec353914d4ce10dbd64642876e30c9ea686b0b..b370b1048b13cb02782c4b03636823fd5b850886 100644 (file)
--- 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 eb0770fd59ed6b135ea3fd6dd1014c9eff6edde6..1e61659203a339060bc26d055831251f1b79809c 100644 (file)
--- 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