aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2009-07-06 10:52:15 +0000
committerFlorian Fainelli <florian@openwrt.org>2009-07-06 10:52:15 +0000
commit6e4bfa47f946d6d85b20e3d6ce2adb96dc708dab (patch)
treefd88374cc98c7bf2d9eec10c51824207957902ff
parent43565a8321ee552a708d946edc7ab6011e0123d8 (diff)
downloadupstream-6e4bfa47f946d6d85b20e3d6ce2adb96dc708dab.tar.gz
upstream-6e4bfa47f946d6d85b20e3d6ce2adb96dc708dab.tar.bz2
upstream-6e4bfa47f946d6d85b20e3d6ce2adb96dc708dab.zip
[kernel] avoid overriding CONFIG_TUN with a couple of targets
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@16705 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--target/linux/iop32x/config-default1
-rw-r--r--target/linux/olpc/config-2.6.271
-rw-r--r--target/linux/orion/config-default1
-rw-r--r--target/linux/pxa/config-default1
4 files changed, 0 insertions, 4 deletions
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