X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=openwrt%2Ftarget%2Flinux%2FConfig.in;h=c4336eeceb0eac9565b05bd43aed6b3c51e91d5a;hb=8fa1e7be911660d2019098469950efcd74bdb3fe;hp=bb5afd30ca76fae6ad4b05c3dc3ab994c14e016a;hpb=9dc57adbb7b3744c0b29875815f58e5cf15b838e;p=openwrt%2Fsvn-archive%2Farchive.git

diff --git a/openwrt/target/linux/Config.in b/openwrt/target/linux/Config.in
index bb5afd30ca..c4336eeceb 100644
--- a/openwrt/target/linux/Config.in
+++ b/openwrt/target/linux/Config.in
@@ -9,6 +9,7 @@ menu "Target Root Filesystem"
 	config BR2_TARGET_ROOTFS_SQUASHFS_LZMA
 		bool "squashfs-lzma"
 		default y
+		depends !BR2_LINUX_2_6_ARUBA
 		help
 		  Build a squashfs-lzma root filesystem
 
@@ -22,11 +23,13 @@ endmenu
 
 menu "Kernel Configuration / Device Support"
 
-comment "Device specific modules"
+comment "Device specific configuration"
 
 source "target/linux/*-2.[46]/Config.in"
 
-comment "Networking modules"
+comment "Kernel modules"
+
+menu "Networking modules"
 
 config BR2_PACKAGE_KMOD_ATM
 	prompt "kmod-atm.......................... ATM support"
@@ -42,6 +45,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"
@@ -105,7 +115,9 @@ config BR2_PACKAGE_KMOD_TUN
 	help
 	  Kernel support for the TUN/TAP tunneling device
 
-comment "Filtering/Firewalling"
+endmenu
+
+menu "Filtering/Firewalling"
 
 config BR2_PACKAGE_KMOD_ARPTABLES
 	prompt "kmod-arptables.................... ARP firewalling support"
@@ -263,7 +275,9 @@ config BR2_PACKAGE_KMOD_IP6TABLES
 	help
 	  IPv6 firewalling support
 
-comment "Block devices support"
+endmenu
+
+menu "Block devices support"
 
 config BR2_PACKAGE_KMOD_IDE
 	prompt "kmod-ide.......................... IDE support"
@@ -273,6 +287,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"
@@ -288,19 +308,19 @@ config BR2_PACKAGE_KMOD_NBD
 	help
 	  Kernel module for network block device
 
-comment "Cryptographic support"
+endmenu
 
 config BR2_PACKAGE_KMOD_CRYPTO
-	prompt "kmod-crypto....................... CryptoAPI modules"
+	prompt "CryptoAPI modules"
 	tristate
 	default m
 	select BUSYBOX_CONFIG_FEATURE_CHECK_TAINTED_MODULE
 	help
 	  Kernel modules for cryptographic algorithms
 
-comment "Filesystems support"
+menu "Filesystems support"
 
-config BR2_PACKAGE_KMOD_CIFS
+config BR2_PACKAGE_KMOD_FS_CIFS
 	prompt "kmod-fs-cifs...................... CIFS support"
 	tristate
 	default m
@@ -351,7 +371,9 @@ config BR2_PACKAGE_KMOD_FS_XFS
 	help
 	  Kernel modules for XFS filesystem support
 
-comment "Multimedia devices support"
+endmenu
+
+menu "Multimedia devices support"
 
 config BR2_PACKAGE_KMOD_PWC
 	prompt "kmod-pwc.......................... Kernel driver for USB Philips Cameras"
@@ -372,7 +394,9 @@ config BR2_PACKAGE_KMOD_VIDEODEV
 	tristate
 	default m
 
-comment "Native Language support"
+endmenu
+
+menu "Native Language support"
 
 config BR2_PACKAGE_KMOD_NLS_BASE
 	prompt "kmod-nls-base..................... Native Language support"
@@ -421,7 +445,10 @@ config BR2_PACKAGE_KMOD_NLS_UTF8
 	help
 	  Kernel native language support
 
-comment "Network devices support"
+endmenu
+
+menu "Network devices support"
+	depends BR2_LINUX_2_4_X86 || BR2_LINUX_2_6_X86
 
 config BR2_PACKAGE_KMOD_NET_3C59X
 	prompt "kmod-net-3c59x.................... 3Com 3c590/3c900 series (592/595/597) \"Vortex/Boomerang\" Ethernet kernel support"
@@ -515,8 +542,7 @@ config BR2_PACKAGE_KMOD_NET_HERMES_PLX
 config BR2_PACKAGE_KMOD_NET_NATSEMI
 	prompt "kmod-net-natsemi.................. National Semiconductor DP8381x series PCI Ethernet kernel support"
 	tristate
-	depends BR2_LINUX_2_4_X86 || BR2_LINUX_2_6_X86 || BR2_LINUX_2_6_ARUBA
-	default y if BR2_LINUX_2_6_ARUBA
+	depends BR2_LINUX_2_4_X86 || BR2_LINUX_2_6_X86
 	default m
 	help
 	  This driver is for the National Semiconductor DP83810 series, 
@@ -562,7 +588,10 @@ config BR2_PACKAGE_KMOD_NET_PRISM54
 	  
 	  Note: You need a motherboard with DMA support to use any of these cards.
 
-comment "PCMCIA/CardBus support"
+endmenu
+
+menu "PCMCIA/CardBus support"
+	depends BR2_LINUX_2_4_X86 || BR2_LINUX_2_6_X86 || BR2_LINUX_2_4_BRCM || BR2_LINUX_2_6_BRCM
 
 config BR2_PACKAGE_KMOD_PCMCIA_CORE
 	prompt "kmod-pcmcia-core.................. PCMCIA/CardBus support"
@@ -577,7 +606,9 @@ config BR2_PACKAGE_KMOD_PCMCIA_SERIAL
 	default m
 	depends BR2_PACKAGE_KMOD_PCMCIA_CORE
 
-comment "USB support"
+endmenu
+
+menu "USB support"
 
 config BR2_PACKAGE_KMOD_USB
 	prompt "kmod-usb-core..................... USB support"
@@ -661,7 +692,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
@@ -678,7 +709,15 @@ config BR2_PACKAGE_KMOD_USB_ATM
 	default m
 	depends BR2_PACKAGE_KMOD_USB_CONTROLLER
 
-comment "Misc. devices support"
+config BR2_PACKAGE_KMOD_USB_ATM_SPEEDTOUCH
+        prompt   "kmod-usb-atm-speedtouch......... Support for USB Speedtouch ADSL modem"
+	tristate
+	default m
+	depends BR2_PACKAGE_KMOD_USB_ATM
+
+endmenu
+
+menu "Misc. devices support"
 
 config BR2_PACKAGE_KMOD_AX25
 	prompt "kmod-ax25......................... AX25 support"
@@ -705,7 +744,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
@@ -720,8 +759,12 @@ config BR2_PACKAGE_KMOD_WD1100
 	  Driver for the NatSemi SC1x00 series Watchdog 
 	  found on Soekris net4801 boards
 
-comment "Additional kernel modules"
+endmenu
+
+menu "Additional kernel modules"
 
 source "target/linux/package/Config.in"
 
 endmenu
+
+endmenu