aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/Config.in
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2006-05-30 19:38:38 +0000
committerFelix Fietkau <nbd@openwrt.org>2006-05-30 19:38:38 +0000
commit340f1875ed67c4df30612f9fcd86b6fe9307c77a (patch)
treeeb392a5dc848616550a5c47b5a2481f8e6b8bc1f /target/linux/Config.in
parentf45baccdc5081fc6245c9d567ddb47518f3dc84b (diff)
downloadmaster-187ad058-340f1875ed67c4df30612f9fcd86b6fe9307c77a.tar.gz
master-187ad058-340f1875ed67c4df30612f9fcd86b6fe9307c77a.tar.bz2
master-187ad058-340f1875ed67c4df30612f9fcd86b6fe9307c77a.zip
resync with kamikaze
git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@3844 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/Config.in')
-rw-r--r--target/linux/Config.in12
1 files changed, 10 insertions, 2 deletions
diff --git a/target/linux/Config.in b/target/linux/Config.in
index 5257c78ad0..540e2b7364 100644
--- a/target/linux/Config.in
+++ b/target/linux/Config.in
@@ -10,6 +10,7 @@ menu "Target Root Filesystem"
bool "squashfs-lzma"
default y
depends !LINUX_2_6_ARUBA
+ depends !LINUX_2_6_XSCALE
help
Build a squashfs-lzma root filesystem
@@ -53,6 +54,13 @@ config PACKAGE_KMOD_IMQ
help
Kernel support for the Intermediate Queueing device
+config PACKAGE_KMOD_IPIP
+ prompt "kmod-ipip......................... IP in IP encapsulation support"
+ tristate
+ default m
+ help
+ Kernel module for IP in IP encapsulation
+
config PACKAGE_KMOD_IPV6
prompt "kmod-ipv6......................... IPv6 support"
tristate
@@ -294,7 +302,7 @@ config PACKAGE_KMOD_IDE
- ide-core
- ide-detect
- ide-disk
- - pdc202old
+ - pdc202xx_old
config PACKAGE_KMOD_LOOP
prompt "kmod-loop......................... Loop mount support"
@@ -316,7 +324,7 @@ config PACKAGE_KMOD_CRYPTO
prompt "CryptoAPI modules"
tristate
default m
- select BUSYBOX_FEATURE_CHECK_TAINTED_MODULE
+ select BUSYBOX_CONFIG_FEATURE_CHECK_TAINTED_MODULE
help
Kernel modules for cryptographic algorithms