Add kmod-ipip, closes #539

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

diff --git a/openwrt/target/linux/Config.in b/openwrt/target/linux/Config.in
index c4336ee..eae8b43 100644 (file)
--- a/openwrt/target/linux/Config.in
+++ b/openwrt/target/linux/Config.in
@@ -10,6 +10,7 @@ menu "Target Root Filesystem"
                bool "squashfs-lzma"
                default y
                depends !BR2_LINUX_2_6_ARUBA
+               depends !BR2_LINUX_2_6_XSCALE
                help
                  Build a squashfs-lzma root filesystem
 
@@ -53,6 +54,13 @@ config BR2_PACKAGE_KMOD_IMQ
         help
           Kernel support for the Intermediate Queueing device
 
+config BR2_PACKAGE_KMOD_IPIP
+       prompt "kmod-ipip......................... IP in IP encapsulation support"
+       tristate
+       default m
+       help
+         Kernel module for IP in IP encapsulation
+
 config BR2_PACKAGE_KMOD_IPV6
        prompt "kmod-ipv6......................... IPv6 support"
        tristate
@@ -230,6 +238,8 @@ config BR2_PACKAGE_KMOD_IPT_NAT_EXTRA
            * ip_nat_proto_gre
            * ip_conntrack_pptp
            * ip_nat_pptp
+           * ip_conntrack_sip
+           * ip_nat_sip
            * ip_nat_snmp_basic
            * ip_conntrack_tftp
 
@@ -616,10 +626,10 @@ config BR2_PACKAGE_KMOD_USB
        default n if BR2_LINUX_2_4_AR531X
        default m
 
-config BR2_PACKAGE_KMOD_USB_UHCI
+config BR2_PACKAGE_KMOD_USB_UHCI 
        prompt   "kmod-usb-uhci................... Support for UHCI controllers"
        tristate
-       default m
+       default n if BR2_LINUX_2_6_AU1000
        depends BR2_PACKAGE_KMOD_USB
        select BR2_PACKAGE_KMOD_USB_CONTROLLER
 
@@ -633,7 +643,7 @@ config BR2_PACKAGE_KMOD_USB_OHCI
 config BR2_PACKAGE_KMOD_USB2
        prompt   "kmod-usb2....................... Support for USB 2.0 controllers"
        tristate
-       default m
+       default n if BR2_LINUX_2_6_AU1000
        depends BR2_PACKAGE_KMOD_USB
        select BR2_PACKAGE_KMOD_USB_CONTROLLER