resync with kamikaze

[15.05/openwrt.git] / target / linux / Config.in

diff --git a/target/linux/Config.in b/target/linux/Config.in
index 5257c78..540e2b7 100644 (file)
--- 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