rework the kernel menuconfig, always use prompt to display config text instead of...
[openwrt/staging/mkresin.git] / openwrt / target / linux / Config.in
index c43f25d30e1eff38fb7905c4bb477b5d8c4b826b..443dca4639ec578329e5ea413660e30a568b65d3 100644 (file)
@@ -27,7 +27,7 @@ config BR2_LINUX_2_4_X86
        help
          Build firmware images for x86 based boards
          (e.g. Soekris net4521 and net4801, PC Engines WRAP...)
-        
+
 config BR2_LINUX_2_6_BRCM
        bool "Support for Broadcom based routers [2.6]"
        default n
@@ -35,13 +35,38 @@ config BR2_LINUX_2_6_BRCM
        help
          Build firmware images for Broadcom based routers
          (e.g. Netgear WGT634u)
-       
+
 endchoice
        
-comment "Kernel Modules"
+comment "Device specific modules"
+
+config BR2_PACKAGE_KMOD_BRCM_ET
+       prompt "kmod-brcm-et...................... Broadcom Ethernet Driver"
+       tristate
+       depends BR2_LINUX_2_4_BRCM
+       default y
+       help
+         Proprietary driver for Broadcom Ethernet chipsets
+
+config BR2_PACKAGE_KMOD_BRCM_WL
+       prompt "kmod-brcm-wl...................... Broadcom Wireless Network Driver"
+       tristate
+       depends BR2_LINUX_2_4_BRCM
+       default y
+       help
+         Proprietary driver for Broadcom Wireless chipsets
+
+config BR2_PACKAGE_KMOD_CPMAC
+       prompt "kmod-cpmac........................ AR7 CPMAC Network Driver"
+       tristate
+       default y
+       depends BR2_LINUX_2_4_AR7
+       help
+         Driver for the AR7 CPMAC network chip
 
 config BR2_PACKAGE_KMOD_SANGAM_ATM_A
-       tristate "AR7 Sangam ADSL Driver (Annex A)"
+       prompt "kmod-sangam-atm-annex-a........... AR7 Sangam ADSL Driver (Annex A)"
+       tristate
        default m
        depends BR2_LINUX_2_4_AR7
        select BR2_PACKAGE_KMOD_ATM
@@ -50,7 +75,8 @@ config BR2_PACKAGE_KMOD_SANGAM_ATM_A
          Annex A version
 
 config BR2_PACKAGE_KMOD_SANGAM_ATM_B
-       tristate "AR7 Sangam ADSL Driver (Annex B)"
+       prompt "kmod-sangam-atm-annex-b........... AR7 Sangam ADSL Driver (Annex B)"
+       tristate
        default y
        depends BR2_LINUX_2_4_AR7
        select BR2_PACKAGE_KMOD_ATM
@@ -58,354 +84,276 @@ config BR2_PACKAGE_KMOD_SANGAM_ATM_B
          ATM driver for the Sangam ADSL chip on AR7
          Annex B version
 
-config BR2_PACKAGE_KMOD_CPMAC
-       tristate "AR7 CPMAC Network Driver"
-       default y
-       depends BR2_LINUX_2_4_AR7
-       help
-         Driver for the AR7 CPMAC network chip
+comment "Networking modules"
 
-config BR2_PACKAGE_KMOD_BRCM_WL
-       tristate "Broadcom Wireless Network Driver"
-       depends BR2_LINUX_2_4_BRCM
-       default y
-       help
-         Proprietary driver for Broadcom Wireless chipsets
-
-config BR2_PACKAGE_KMOD_BRCM_ET
-       tristate "Broadcom Ethernet Driver"
-       depends BR2_LINUX_2_4_BRCM
-       default y
-       help
-         Proprietary driver for Broadcom Ethernet chipsets
-
-config BR2_PACKAGE_KMOD_B44
-       tristate "Broadcom 44XX, 47XX ethernet driver"
-       default m
-       default y if BR2_LINUX_2_6_BRCM
+config BR2_PACKAGE_KMOD_ATM
+       prompt "kmod-atm.......................... ATM support"
+       tristate
+       default y if BR2_LINUX_2_4_AR7
        help
-         Free driver for Broadcom Ethernet chipsets (without switch support)
+         ATM support
 
-config BR2_PACKAGE_KMOD_ARPT
-       tristate "ARP firewalling support"
+config BR2_PACKAGE_KMOD_GRE
+       prompt "kmod-gre.......................... GRE tunneling driver"
+       tristate
        default m
        help
-         Kernel modules for ARP firewalling
+         Kernel support for GRE tunnels
 
-config BR2_PACKAGE_KMOD_BLUETOOTH
-       tristate "Bluetooth drivers and network stack"
+config BR2_PACKAGE_KMOD_IPV6
+       prompt "kmod-ipv6......................... IPv6 support"
+       tristate
        default m
        help
-         Bluetooth drivers and network stack
+         Kernel modules for IPv6 protocol support
 
-config BR2_PACKAGE_KMOD_EBT
-       tristate "Ethernet Bridge firewalling support"
+config BR2_PACKAGE_KMOD_PPP
+       prompt "kmod-ppp.......................... PPP support"
+       tristate
        default m
        help
-         Kernel modules for bridge firewalling
-
-config BR2_PACKAGE_KMOD_IPTABLES_V4
-       tristate "Basic set of kernel modules for iptables"
-       default y
-       help
-         Kernel modules for IPv4 firewalling
+         Kernel support for PPP
 
-config BR2_PACKAGE_KMOD_AX25
-       tristate "AX25 support"
+config BR2_PACKAGE_KMOD_MPPE
+       prompt   "kmod-mppe....................... PPP MPPE/MPPC module"
+       tristate
        default m
+       depends BR2_PACKAGE_KMOD_PPP
+       select BR2_PACKAGE_KMOD_CRYPTO
        help
-         Kernel modules for AX25 protocol family
-          - ax25.o: AX25 layer 2 support
-          - mkiss.o: AX25 KISS driver
+         Support for Microsoft PPP Encryption/Compression
 
-config BR2_PACKAGE_KMOD_IPTABLES_V4_EXTRA
-       tristate "Extra modules for iptables"
+config BR2_PACKAGE_KMOD_PPPOATM
+       prompt   "kmod-pppoatm.................... PPPoA (PPP over ATM) kernel support"
+       tristate
+       default y if BR2_LINUX_2_4_AR7
        default m
+       depends BR2_PACKAGE_KMOD_PPP
+       select BR2_PACKAGE_KMOD_ATM
        help
-         Extra kernel modules for IPv4 firewalling
+         Support for PPP over ATM
 
-config BR2_PACKAGE_KMOD_IPV6
-       tristate "IPv6 support"
-       default m
-       help
-         Kernel modules for IPv6 protocol support
-         
-config BR2_PACKAGE_KMOD_IPTABLES_V6
-       tristate "Kernel modules for ip6tables"
+config BR2_PACKAGE_KMOD_PPPOE
+       prompt   "kmod-pppoe...................... PPPoE (PPP over Ethernet) kernel support"
+       tristate
        default m
-       depends BR2_PACKAGE_KMOD_IPV6
+       depends BR2_PACKAGE_KMOD_PPP
        help
-         IPv6 firewalling support
+         Support for PPP over Ethernet
 
-config BR2_PACKAGE_KMOD_NFS
-       tristate "NFS support"
+config BR2_PACKAGE_KMOD_SCHED
+       prompt "kmod-sched........................ Traffic schedulers"
+       tristate
        default m
        help
-         Kernel modules for NFS support
-         Includes lockd, nfs and sunrpc
+         Kernel schedulers for IP traffic
 
-config BR2_PACKAGE_KMOD_CIFS
-       tristate "CIFS support"
+config BR2_PACKAGE_KMOD_TUN
+       prompt "kmod-tun.......................... Universal TUN/TAP driver"
+       tristate
        default m
        help
-         Kernel modules for CIFS support
+         Kernel support for the TUN/TAP tunneling device
 
-config BR2_PACKAGE_KMOD_SOUNDCORE
-       tristate "Soundcard support"
-       default n
-       help
-         Base support for soundcards
-         Requires either USB soundcard support (OSS) or ALSA package to be useful
+comment "Filtering/Firewalling"
 
-config BR2_PACKAGE_KMOD_USB
-       tristate "USB support"
-       default m
-
-config BR2_PACKAGE_KMOD_USB_CONTROLLER
+config BR2_PACKAGE_KMOD_ARPTABLES
+       prompt "kmod-arptables.................... ARP firewalling support"
        tristate
-       depends on BR2_PACKAGE_KMOD_USB_UHCI || BR2_PACKAGE_KMOD_USB_OHCI || BR2_PACKAGE_KMOD_USB2
-       default n
-
-config BR2_PACKAGE_KMOD_USB_UHCI
-       tristate "Support for UHCI controllers"
-       default m
-       depends BR2_PACKAGE_KMOD_USB
-       select BR2_PACKAGE_KMOD_USB_CONTROLLER
-
-config BR2_PACKAGE_KMOD_USB_OHCI
-       tristate "Support for OHCI controllers"
-       default m
-       depends BR2_PACKAGE_KMOD_USB
-       select BR2_PACKAGE_KMOD_USB_CONTROLLER
-
-config BR2_PACKAGE_KMOD_USB2
-       tristate "Support for USB 2.0 controllers"
-       default m
-       depends BR2_PACKAGE_KMOD_USB
-       select BR2_PACKAGE_KMOD_USB_CONTROLLER
-
-config BR2_PACKAGE_KMOD_USB_SERIAL
-       tristate "kmod-usb-serial - Support for USB-to-serial converters"
-       default m
-       depends BR2_PACKAGE_KMOD_USB_CONTROLLER
-
-config BR2_PACKAGE_KMOD_USB_SERIAL_BELKIN
-       tristate "kmod-usb-serial-belkin - Support for Belkin USB-to-serial converters"
-       default m
-       depends BR2_PACKAGE_KMOD_USB_SERIAL
-
-config BR2_PACKAGE_KMOD_USB_SERIAL_FTDI
-       tristate "kmod-usb-serial-ftdi - Support for FTDI USB-to-serial converterr"
-       default m
-       depends BR2_PACKAGE_KMOD_USB_SERIAL
-
-config BR2_PACKAGE_KMOD_USB_SERIAL_MCT_U232
-       tristate "kmod-usb-serial-mct-u232 - Support for Magic Control Technology USB-to-Serial converters"
-       default m
-       depends BR2_PACKAGE_KMOD_USB_SERIAL
-
-config BR2_PACKAGE_KMOD_USB_SERIAL_PL2303
-       tristate "kmod-usb-serial-pl2303 - Support for Prolific PL2303 USB-to-Serial converters"
-       default m
-       depends BR2_PACKAGE_KMOD_USB_SERIAL
-
-config BR2_PACKAGE_KMOD_USB_STORAGE
-       tristate "Support for USB storage devices"
-       default m
-       depends BR2_PACKAGE_KMOD_USB_CONTROLLER
-
-config BR2_PACKAGE_KMOD_USB_PRINTER
-       tristate "Support for USB printers"
-       default m
-       depends BR2_PACKAGE_KMOD_USB_CONTROLLER
-
-config BR2_PACKAGE_KMOD_USB_AUDIO
-       tristate "Support for USB soundcards"
-       default m
-       depends BR2_PACKAGE_KMOD_USB_CONTROLLER
-       select BR2_PACKAGE_KMOD_SOUNDCORE
-
-config BR2_PACKAGE_KMOD_USB_ACM
-       tristate "Support for USB modems/isdn controllers"
-       default m
-       depends BR2_PACKAGE_KMOD_USB_CONTROLLER
-
-config BR2_PACKAGE_KMOD_IDE
-       tristate "IDE support"
        default m
        help
-         Kernel modules for IDE support
-         useful for usb mass storage devices (e.g. on WL-HDD)
+         Kernel modules for ARP firewalling
 
-config BR2_PACKAGE_KMOD_VFAT
-       tristate "VFAT filesystem support"
+config BR2_PACKAGE_KMOD_EBTABLES
+       prompt "kmod-ebtables..................... Ethernet Bridge firewalling support"
+       tristate
        default m
-       depends on BR2_PACKAGE_KMOD_NLS_BASE
-       depends on BR2_PACKAGE_KMOD_NLS_CP437 || BR2_PACKAGE_KMOD_NLS_CP850
        help
-         Kernel modules for VFAT filesystem support
-         useful for usb mass storage devices
+         Kernel modules for bridge firewalling
 
-config BR2_PACKAGE_KMOD_EXT2
-       tristate "EXT2 filesystem support"
-       default m
+config BR2_PACKAGE_KMOD_IPTABLES_V4
+       prompt "kmod-iptables..................... Basic set of kernel modules for iptables"
+       tristate
+       default y
        help
-         Kernel modules for EXT2 filesystem support
+         Kernel modules for IPv4 firewalling
 
-config BR2_PACKAGE_KMOD_EXT3
-       tristate "EXT3 filesystem support"
+config BR2_PACKAGE_KMOD_IPTABLES_V4_EXTRA
+       prompt "kmod-iptables-extra............... Extra modules for iptables"
+       tristate
        default m
        help
-         Kernel modules for EXT3 filesystem support
+         Extra kernel modules for IPv4 firewalling
 
-config BR2_PACKAGE_KMOD_XFS
-       tristate "XFS filesystem support"
+config BR2_PACKAGE_KMOD_IPTABLES_V6
+       prompt "kmod-ip6tables.................... Kernel modules for ip6tables"
+       tristate
        default m
+       depends BR2_PACKAGE_KMOD_IPV6
        help
-         Kernel modules for XFS filesystem support
+         IPv6 firewalling support
+
+comment "Block devices support"
 
-config BR2_PACKAGE_KMOD_HFSPLUS
-       tristate "HFS+ filesystem support"
+config BR2_PACKAGE_KMOD_IDE
+       prompt "kmod-ide.......................... IDE support"
+       tristate
        default m
        help
-         Kernel modules for HFS+ filesystem support
+         Kernel modules for IDE support
+         useful for usb mass storage devices (e.g. on WL-HDD)
 
 config BR2_PACKAGE_KMOD_LOOP
-       tristate "loop mount support"
+       prompt "kmod-loop......................... Loop mount support"
+       tristate
        default m
        help
          Kernel module for loop mount support
 
 config BR2_PACKAGE_KMOD_NBD
-       tristate "network block device"
+       prompt "kmod-nbd.......................... Network Block Device"
+       tristate
        default m
        help
          Kernel module for network block device
 
-config BR2_PACKAGE_KMOD_LP
-       tristate "parallel port and lp support"
-       default m
-       help
-         Kernel modules for line printer and parallel port support
+comment "Cryptographic support"
 
 config BR2_PACKAGE_KMOD_CRYPTO
-       tristate "CryptoAPI modules"
+       prompt "kmod-crypto....................... CryptoAPI modules"
+       tristate
        default m
        select BUSYBOX_CONFIG_FEATURE_CHECK_TAINTED_MODULE
        help
          Kernel modules for cryptographic algorithms
 
-config BR2_PACKAGE_KMOD_PPP
-       tristate "PPP support"
-       default m
-       help
-         Kernel support for PPP
+comment "Filesystems support"
 
-config BR2_PACKAGE_KMOD_MPPE
-       tristate "PPP MPPE/MPPC module"
+config BR2_PACKAGE_KMOD_CIFS
+       prompt "kmod-fs-cifs...................... CIFS support"
+       tristate
        default m
-       select BR2_PACKAGE_KMOD_CRYPTO
-       depends BR2_PACKAGE_KMOD_PPP
        help
-         Support for Microsoft PPP Encryption/Compression
+         Kernel modules for CIFS support
 
-config BR2_PACKAGE_KMOD_PPPOE
-       tristate "PPPoE modules"
+config BR2_PACKAGE_KMOD_FS_EXT2
+       prompt "kmod-fs-ext2...................... EXT2 filesystem support"
+       tristate
        default m
-       depends BR2_PACKAGE_KMOD_PPP
        help
-         Support for PPP over Ethernet
+         Kernel modules for EXT2 filesystem support
 
-config BR2_PACKAGE_KMOD_PPPOATM
-       tristate "PPP over ATM"
-       default y if BR2_LINUX_2_4_AR7
+config BR2_PACKAGE_KMOD_FS_EXT3
+       prompt "kmod-fs-ext3...................... EXT3 filesystem support"
+       tristate
        default m
-       depends BR2_PACKAGE_KMOD_PPP
-       select BR2_PACKAGE_KMOD_ATM
        help
-         Support for PPP over ATM
+         Kernel modules for EXT3 filesystem support
 
-config BR2_PACKAGE_KMOD_ATM
-       tristate "ATM support"
-       default y if BR2_LINUX_2_4_AR7
+config BR2_PACKAGE_KMOD_FS_HFSPLUS
+       prompt "kmod-fs-hfsplus................... HFS+ filesystem support"
+       tristate
+       default m
        help
-         ATM support
+         Kernel modules for HFS+ filesystem support
 
-config BR2_PACKAGE_KMOD_TUN
-       tristate "Universal TUN/TAP driver"
+config BR2_PACKAGE_KMOD_FS_NFS
+       prompt "kmod-fs-nfs....................... NFS support"
+       tristate
        default m
        help
-         Kernel support for the TUN/TAP tunneling device
+         Kernel modules for NFS support
+         Includes lockd, nfs and sunrpc
 
-config BR2_PACKAGE_KMOD_GRE
-       tristate "GRE tunneling driver"
+config BR2_PACKAGE_KMOD_FS_VFAT
+       prompt "kmod-fs-vfat...................... VFAT filesystem support"
+       tristate
        default m
        help
-         Kernel support for GRE tunnels
+         Kernel modules for VFAT filesystem support
+         useful for usb mass storage devices
 
-config BR2_PACKAGE_KMOD_SCHED
-       tristate "Traffic schedulers"
+config BR2_PACKAGE_KMOD_FS_XFS
+       prompt "kmod-fs-xfs....................... XFS filesystem support"
+       tristate
        default m
        help
-         Kernel schedulers for IP traffic
+         Kernel modules for XFS filesystem support
 
-comment "Multimedia devices support ---"
+comment "Multimedia devices support"
 
-config BR2_PACKAGE_KMOD_VIDEODEV
-       tristate "kmod-videodev - Video (For Linux) kernel support"
+config BR2_PACKAGE_KMOD_PWC
+       prompt "kmod-pwc.......................... Kernel driver for USB Philips Cameras"
+       tristate
        default m
 
-config BR2_PACKAGE_KMOD_PWC
-       tristate "kmod-pwc - Kernel driver for USB Philips Cameras"
+config BR2_PACKAGE_KMOD_SOUNDCORE
+       prompt "kmod-soundcore.................... Soundcard support"
+       tristate
+       default n
+       help
+         Base support for soundcards
+         Requires either USB soundcard support (OSS) or ALSA package to be useful
+
+config BR2_PACKAGE_KMOD_VIDEODEV
+       prompt "kmod-videodev..................... Video (For Linux) kernel support"
+       tristate
        default m
 
-comment "Native language support ---"
+comment "Native Language support"
 
 config BR2_PACKAGE_KMOD_NLS_BASE
-       tristate "kmod-nls-base - Basic native language support for filesystems"
+       prompt "kmod-nls-base..................... Native Language support"
+       tristate
        default m
        help
          Kernel native language support
 
 config BR2_PACKAGE_KMOD_NLS_CP437
-       tristate "kmod-nls-cp437 - Codepage 437 (United States, Canada)"
+       prompt   "kmod-nls-cp437.................. Codepage 437 (United States, Canada)"
+       tristate
        default m
-       select BR2_PACKAGE_KMOD_NLS_BASE
+       depends BR2_PACKAGE_KMOD_NLS_BASE
        help
          Kernel native language support
 
 config BR2_PACKAGE_KMOD_NLS_CP850
-       tristate "kmod-nls-cp850 - Codepage 850 (Europe)"
+       prompt   "kmod-nls-cp850.................. Codepage 850 (Europe)"
+       tristate
        default m
-       select BR2_PACKAGE_KMOD_NLS_BASE
+       depends BR2_PACKAGE_KMOD_NLS_BASE
        help
          Kernel native language support
 
-config BR2_PACKAGE_KMOD_NLS_IS08859_1
-       tristate "kmod-nls-iso8859-1 -  NLS ISO 8859-1  (Latin 1; Western European Languages)"
+config BR2_PACKAGE_KMOD_NLS_ISO8859_1
+       prompt   "kmod-nls-iso8859-1.............. NLS ISO 8859-1 (Latin 1; Western European Languages)"
+       tristate
        default m
-       select BR2_PACKAGE_KMOD_NLS_BASE
+       depends BR2_PACKAGE_KMOD_NLS_BASE
        help
          Kernel native language support
 
-config BR2_PACKAGE_KMOD_NLS_IS08859_15
-       tristate "kmod-nls-iso8859-15 -  NLS ISO 8859-15  (Latin 15; Western European Languages with Euro)"
+config BR2_PACKAGE_KMOD_NLS_ISO8859_15
+       prompt   "kmod-nls-iso8859-15............. NLS ISO 8859-15 (Latin 15; Western European Languages with Euro)"
+       tristate
        default m
-       select BR2_PACKAGE_KMOD_NLS_BASE
+       depends BR2_PACKAGE_KMOD_NLS_BASE
        help
          Kernel native language support
 
 config BR2_PACKAGE_KMOD_NLS_UTF8
-       tristate "kmod-nls-utf8 - NLS UTF8"
+       prompt   "kmod-nls-utf8................... NLS UTF8"
+       tristate
        default m
-       select BR2_PACKAGE_KMOD_NLS_BASE
+       depends BR2_PACKAGE_KMOD_NLS_BASE
        help
          Kernel native language support
 
-comment "Network devices support ---"
+comment "Network devices support"
 
 config BR2_PACKAGE_KMOD_NET_3C59X
-       tristate "kmod-net-3C59x - 3Com 3c590/3c900 series (592/595/597) \"Vortex/Boomerang\" Ethernet kernel support"
+       prompt "kmod-net-3C59x.................... 3Com 3c590/3c900 series (592/595/597) \"Vortex/Boomerang\" Ethernet kernel support"
+       tristate
        default m
        help
          This option enables driver support for a large number of 10mbps and 
@@ -416,22 +364,18 @@ config BR2_PACKAGE_KMOD_NET_3C59X
           * "Cyclone"   (3c540/3c900/3c905/3c980/3c575/3c656)    PCI and Cardbus
           * "Tornado"   (3c905)                                  PCI
           * "Hurricane" (3c555/3cSOHO)                           PCI
-         
-         This package contains the 3c59x.o kernel module.
-         
 
 config BR2_PACKAGE_KMOD_NET_8139TOO
-       tristate "kmod-net-8139too - RealTek RTL-8139 PCI Fast Ethernet Adapter kernel support"
+       prompt "kmod-net-8139too.................. RealTek RTL-8139 PCI Fast Ethernet Adapter kernel support"
+       tristate
        default m
        help
          This is a driver for the Fast Ethernet PCI network cards based on 
          the RTL8139 chips.
-         
-         This package contains the 8139too.o and mii.o kernel modules.
-         
 
 config BR2_PACKAGE_KMOD_NET_AIRO
-       tristate "kmod-net-airo - Cisco/Aironet 34X/35X/4500/4800 ISA and PCI cards kernel support"
+       prompt "kmod-net-airo..................... Cisco/Aironet 34X/35X/4500/4800 ISA and PCI cards kernel support"
+       tristate
        default m
        help
          This is the standard Linux driver to support Cisco/Aironet ISA and 
@@ -443,12 +387,25 @@ config BR2_PACKAGE_KMOD_NET_AIRO
          This driver support both the standard Linux Wireless Extensions 
          and Cisco proprietary API, so both the Linux Wireless Tools and the 
          Cisco Linux utilities can be used to configure the card.
-         
-         This package contains the airo.o kernel module.
-         
+
+config BR2_PACKAGE_KMOD_E100
+       prompt "kmod-net-e100..................... Intel(R) PRO/100+ cards kernel support"
+       tristate
+       default m
+       help
+         Intel(R) PRO/100+ cards kernel support
+
+config BR2_PACKAGE_KMOD_B44
+       prompt "kmod-net-b44...................... Broadcom 44XX, 47XX ethernet driver"
+       tristate
+       default m
+       default y if BR2_LINUX_2_6_BRCM
+       help
+         Free driver for Broadcom Ethernet chipsets (without switch support)
 
 config BR2_PACKAGE_KMOD_NET_HERMES
-       tristate "kmod-net-hermes - Hermes chipset 802.11b support (Orinoco/Prism2/Symbol) kernel support"
+       prompt "kmod-net-hermes................... Hermes chipset 802.11b support (Orinoco/Prism2/Symbol) kernel support"
+       tristate
        default m
        help
          A driver for 802.11b wireless cards based based on the "Hermes" or 
@@ -460,12 +417,10 @@ config BR2_PACKAGE_KMOD_NET_HERMES
          IBM High Rate Wireless, Farralon Syyline, Samsung MagicLAN, Netgear 
          MA401, LinkSys WPC-11, D-Link DWL-650, 3Com AirConnect, Intel 
          PRO/Wireless, and Symbol Spectrum24 High Rate amongst others.
-         
-         This package contains the hermes.o and orinoco.o kernel modules.
-         
 
 config BR2_PACKAGE_KMOD_NET_HERMES_PCI
-       tristate "kmod-net-hermes-pci - Intersil Prism 2.5 PCI 802.11b adaptor support"
+       prompt   "kmod-net-hermes-pci............. Intersil Prism 2.5 PCI 802.11b adaptor support"
+       tristate
        default m
        depends BR2_PACKAGE_KMOD_NET_HERMES
        help
@@ -474,12 +429,10 @@ config BR2_PACKAGE_KMOD_NET_HERMES_PCI
          PCMCIA cards bundled with PCI<->PCMCIA adaptors which are also 
          common.  Some of the built-in wireless adaptors in laptops are of 
          this variety.
-         
-         This package contains the orinoco_pci.o kernel module.
-         
 
 config BR2_PACKAGE_KMOD_NET_HERMES_PLX
-       tristate "kmod-net-hermes-plx - Hermes in PLX9052 based PCI adaptor (Netgear MA301, etc.) kernel support"
+       prompt   "kmod-net-hermes-plx............. Hermes in PLX9052 based PCI adaptor (Netgear MA301, etc.) kernel support"
+       tristate
        default m
        depends BR2_PACKAGE_KMOD_NET_HERMES
        help
@@ -489,23 +442,19 @@ config BR2_PACKAGE_KMOD_NET_HERMES_PLX
          PCI <-> PCMCIA bridge.  Several vendors sell such adaptors so that 
          802.11b PCMCIA cards can be used in desktop machines.  The Netgear 
          MA301 is such an adaptor.
-         
-         This package contains the orinoco_plx.o kernel module.
-         
 
 config BR2_PACKAGE_KMOD_NET_NATSEMI
-       tristate "kmod-net-natsemi - National Semiconductor DP8381x series PCI Ethernet kernel support"
+       prompt "kmod-net-natsemi.................. National Semiconductor DP8381x series PCI Ethernet kernel support"
+       tristate
        default m
        help
          This driver is for the National Semiconductor DP83810 series, 
          which is used in cards from PureData, NetGear, Linksys 
          and others, including the 83815 chip.
-         
-         This package contains the natsemi.o kernel module.
-         
 
 config BR2_PACKAGE_KMOD_NET_PRISM54
-       tristate "kmod-net-prism54 - Intersil Prism GT/Duette/Indigo PCI/PCMCIA cards kernel support"
+       prompt "kmod-net-prism54.................. Intersil Prism GT/Duette/Indigo PCI/PCMCIA cards kernel support"
+       tristate
        default m
        help
          Enable PCI and Cardbus support for the following chipset based cards: 
@@ -540,20 +489,136 @@ config BR2_PACKAGE_KMOD_NET_PRISM54
          <http://prism54.org>.
          
          Note: You need a motherboard with DMA support to use any of these cards.
+
+comment "PCMCIA/CardBus support"
+
+config BR2_PACKAGE_KMOD_PCMCIA_CORE
+       prompt "kmod-pcmcia-core.................. PCMCIA/CardBus support"
+       tristate
+       default m
+
+comment "USB support"
+
+config BR2_PACKAGE_KMOD_USB
+       prompt "kmod-usb-core..................... USB support"
+       tristate
+       default m
+
+config BR2_PACKAGE_KMOD_USB_UHCI
+       prompt   "kmod-usb-uhci................... Support for UHCI controllers"
+       tristate
+       default m
+       depends BR2_PACKAGE_KMOD_USB
+       select BR2_PACKAGE_KMOD_USB_CONTROLLER
+
+config BR2_PACKAGE_KMOD_USB_OHCI
+       prompt   "kmod-usb-ohci................... Support for OHCI controllers"
+       tristate
+       default m
+       depends BR2_PACKAGE_KMOD_USB
+       select BR2_PACKAGE_KMOD_USB_CONTROLLER
+
+config BR2_PACKAGE_KMOD_USB2
+       prompt   "kmod-usb2....................... Support for USB 2.0 controllers"
+       tristate
+       default m
+       depends BR2_PACKAGE_KMOD_USB
+       select BR2_PACKAGE_KMOD_USB_CONTROLLER
+
+config BR2_PACKAGE_KMOD_USB_CONTROLLER
+       tristate
+       depends on BR2_PACKAGE_KMOD_USB_UHCI || BR2_PACKAGE_KMOD_USB_OHCI || BR2_PACKAGE_KMOD_USB2
+       default n
+
+config BR2_PACKAGE_KMOD_USB_ACM
+       prompt "kmod-usb-acm...................... Support for USB modems/isdn controllers"
+       tristate
+       default m
+       depends BR2_PACKAGE_KMOD_USB_CONTROLLER
+
+config BR2_PACKAGE_KMOD_USB_AUDIO
+       prompt "kmod-usb-audio.................... Support for USB soundcards"
+       tristate
+       default m
+       depends BR2_PACKAGE_KMOD_USB_CONTROLLER
+       select BR2_PACKAGE_KMOD_SOUNDCORE
+
+config BR2_PACKAGE_KMOD_USB_PRINTER
+       prompt "kmod-usb-printer.................. Support for USB printers"
+       tristate
+       default m
+       depends BR2_PACKAGE_KMOD_USB_CONTROLLER
+
+config BR2_PACKAGE_KMOD_USB_SERIAL
+       prompt "kmod-usb-serial................... Support for USB-to-serial converters"
+       tristate
+       default m
+       depends BR2_PACKAGE_KMOD_USB_CONTROLLER
+
+config BR2_PACKAGE_KMOD_USB_SERIAL_BELKIN
+       prompt   "kmod-usb-serial-belkin.......... Support for Belkin USB-to-serial converters"
+       tristate
+       default m
+       depends BR2_PACKAGE_KMOD_USB_SERIAL
+
+config BR2_PACKAGE_KMOD_USB_SERIAL_FTDI
+       prompt   "kmod-usb-serial-ftdi............ Support for FTDI USB-to-serial converterr"
+       tristate
+       default m
+       depends BR2_PACKAGE_KMOD_USB_SERIAL
+
+config BR2_PACKAGE_KMOD_USB_SERIAL_MCT_U232
+       prompt   "kmod-usb-serial-mct-u232........ Support for Magic Control Technology USB-to-Serial converters"
+       tristate
+       default m
+       depends BR2_PACKAGE_KMOD_USB_SERIAL
+
+config BR2_PACKAGE_KMOD_USB_SERIAL_PL2303
+       prompt   "kmod-usb-serial-pl2303.......... Support for Prolific PL2303 USB-to-Serial converters"
+       tristate
+       default m
+       depends BR2_PACKAGE_KMOD_USB_SERIAL
+
+config BR2_PACKAGE_KMOD_USB_STORAGE
+       prompt "kmod-usb-storage.................. Support for USB storage devices"
+       tristate
+       default m
+       depends BR2_PACKAGE_KMOD_USB_CONTROLLER
+
+comment "Misc. devices support"
+
+config BR2_PACKAGE_KMOD_AX25
+       prompt "kmod-ax25......................... AX25 support"
+       tristate
+       default m
+       help
+         Kernel modules for AX25 protocol family
          
-         This package contains the prism54.o kernel module.
-         
+         This package contains both the AX25 layer 2 support (ax25) and AX25 KISS driver (mkiss)
 
-comment "Misc. device support ---"
+config BR2_PACKAGE_KMOD_BLUETOOTH
+       prompt "kmod-bluetooth.................... Bluetooth drivers and network stack"
+       tristate
+       default m
+       help
+         Bluetooth drivers and network stack
+
+config BR2_PACKAGE_KMOD_LP
+       prompt "kmod-lp........................... Parallel port and lp support"
+       tristate
+       default m
+       help
+         Kernel modules for line printer and parallel port support
 
 config BR2_PACKAGE_KMOD_WD1100
-       tristate "Soekris net4801 watchdog"
+       prompt "kmod-wd1100....................... Soekris net4801 watchdog"
+       tristate
        default y
        depends BR2_LINUX_2_4_X86
        help
          Driver for the NatSemi SC1x00 series Watchdog 
          found on Soekris net4801 boards
 
-comment "Additional kernel modules ---"
+comment "Additional kernel modules"
 
 source "target/linux/package/Config.in"