X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/6d3d87722892b5b08a34c19fc3e91e71a46a1660..b14d40272eb178a72870b90d65b953532eccf05d:/openwrt/target/linux/Config.in

diff --git a/openwrt/target/linux/Config.in b/openwrt/target/linux/Config.in
index c9571291d..c6427115f 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
 
@@ -230,6 +231,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
 
@@ -619,7 +622,7 @@ config BR2_PACKAGE_KMOD_USB
 config BR2_PACKAGE_KMOD_USB_UHCI 
 	prompt   "kmod-usb-uhci................... Support for UHCI controllers"
 	tristate
-	default n if BR2_LINUX_2_6_MTX-1
+	default n if BR2_LINUX_2_6_AU1000
 	depends BR2_PACKAGE_KMOD_USB
 	select BR2_PACKAGE_KMOD_USB_CONTROLLER
 
@@ -633,7 +636,7 @@ config BR2_PACKAGE_KMOD_USB_OHCI
 config BR2_PACKAGE_KMOD_USB2
 	prompt   "kmod-usb2....................... Support for USB 2.0 controllers"
 	tristate
-	default n if BR2_LINUX_2_6_MTX-1
+	default n if BR2_LINUX_2_6_AU1000
 	depends BR2_PACKAGE_KMOD_USB
 	select BR2_PACKAGE_KMOD_USB_CONTROLLER