X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=openwrt%2Ftarget%2Flinux%2FConfig.in;h=c6427115fc13b1ade607b1b1c4f1e6f211ca4cb8;hb=9921eb2b4bb532b7bb70c96398040f2482cca2bf;hp=fca77141b3f6f77e56e686a5a161a1e10e226fef;hpb=10b5ed19c503a39349824eb9949f21cd7e951267;p=openwrt%2Fsvn-archive%2Farchive.git

diff --git a/openwrt/target/linux/Config.in b/openwrt/target/linux/Config.in
index fca77141b3..c6427115fc 100644
--- a/openwrt/target/linux/Config.in
+++ b/openwrt/target/linux/Config.in
@@ -9,6 +9,8 @@ menu "Target Root Filesystem"
 	config BR2_TARGET_ROOTFS_SQUASHFS_LZMA
 		bool "squashfs-lzma"
 		default y
+		depends !BR2_LINUX_2_6_ARUBA
+		depends !BR2_LINUX_2_6_XSCALE
 		help
 		  Build a squashfs-lzma root filesystem
 
@@ -44,6 +46,13 @@ config BR2_PACKAGE_KMOD_GRE
 	default m
 	help
 	  Kernel support for GRE tunnels
+	
+config BR2_PACKAGE_KMOD_IMQ
+        prompt "kmod-imq.......................... Intermediate Queueing device"
+        tristate
+        default m
+        help
+          Kernel support for the Intermediate Queueing device
 
 config BR2_PACKAGE_KMOD_IPV6
 	prompt "kmod-ipv6......................... IPv6 support"
@@ -222,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
 
@@ -279,6 +290,12 @@ config BR2_PACKAGE_KMOD_IDE
 	help
 	  Kernel modules for IDE support
 	  useful for usb mass storage devices (e.g. on WL-HDD)
+	  
+	  Includes:
+	    - ide-core
+	    - ide-detect
+	    - ide-disk
+	    - pdc202xx_old
 
 config BR2_PACKAGE_KMOD_LOOP
 	prompt "kmod-loop......................... Loop mount support"
@@ -602,10 +619,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
 
@@ -619,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 m
+	default n if BR2_LINUX_2_6_AU1000
 	depends BR2_PACKAGE_KMOD_USB
 	select BR2_PACKAGE_KMOD_USB_CONTROLLER
 
@@ -678,7 +695,7 @@ config BR2_PACKAGE_KMOD_USB_SERIAL_PL2303
 	depends BR2_PACKAGE_KMOD_USB_SERIAL
 
 config BR2_PACKAGE_KMOD_USB_SERIAL_VISOR
-	prompt   "kmod-usb-serial-visor.......... Support for Handspring Visor / Palm m50x / Sony Clie Driver"
+	prompt   "kmod-usb-serial-visor........... Support for Handspring Visor / Palm m50x / Sony Clie Driver"
 	tristate
 	default m
 	depends BR2_PACKAGE_KMOD_USB_SERIAL
@@ -696,7 +713,7 @@ config BR2_PACKAGE_KMOD_USB_ATM
 	depends BR2_PACKAGE_KMOD_USB_CONTROLLER
 
 config BR2_PACKAGE_KMOD_USB_ATM_SPEEDTOUCH
-        prompt "kmod-usb-atm-speedtouch........... Support for USB Speedtouch ADSL modem"
+        prompt   "kmod-usb-atm-speedtouch......... Support for USB Speedtouch ADSL modem"
 	tristate
 	default m
 	depends BR2_PACKAGE_KMOD_USB_ATM
@@ -730,7 +747,7 @@ config BR2_PACKAGE_KMOD_LP
 	  Kernel modules for line printer and parallel port support
 
 config BR2_PACKAGE_KMOD_SOFTDOG
-	prompt "kmod-softdog..................... software watchdog"
+	prompt "kmod-softdog...................... Software watchdog"
 	tristate
 	default m
 	help