X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/5b456257d1fdee0690877297af374db0cc6a92c0..be8041e41cc67fda3efa11dc266a1ed438f465ea:/openwrt/target/linux/Config.in

diff --git a/openwrt/target/linux/Config.in b/openwrt/target/linux/Config.in
index 87cd436dd..eae8b43e9 100644
--- 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