remove duplicate package/ prefix from package dump error message
[openwrt.git] / target / linux / Config.in
index f360a0c..9929b9e 100644 (file)
-choice
-       prompt "Target system"
-       
-config BR2_LINUX_2_4_BRCM
-       bool "Support for Broadcom based routers [2.4]"
-       default y
-       depends BR2_mipsel
-       help
-         Build firmware images for Broadcom based routers
-         (e.g. Linksys WRT54G(S), Asus WL-500g, Motorola WR850G)
-         
-         This one builds the generic .trx images, activate one of the
-         options below for creating device specific files for use 
-         with TFTP client too. 
+menu "Kernel Configuration / Device Support"
 
-config BR2_LINUX_2_4_AR7
-       bool "Support for TI AR7 based devices [2.4]"
-       default n
-       depends BR2_mipsel
-       help
-         Build firmware images for TI AR7 based routers (w.g. Linksys WAG54G v2)
+comment "Device specific configuration"
 
-config BR2_LINUX_2_4_X86
-       bool "Support for x86 boards [2.4]"
-       default n
-       depends BR2_i386
-       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
-       depends BR2_mipsel
-       help
-         Build firmware images for Broadcom based routers
-         (e.g. Netgear WGT634u)
-       
-endchoice
-       
-comment "Kernel Modules"
-
-config BR2_PACKAGE_KMOD_SANGAM_ATM_A
-       tristate "AR7 Sangam ADSL Driver (Annex A)"
-       default m
-       depends BR2_LINUX_2_4_AR7
-       select BR2_PACKAGE_KMOD_ATM
-       help
-         ATM driver for the Sangam ADSL chip on AR7
-         Annex A version
-
-config BR2_PACKAGE_KMOD_SANGAM_ATM_B
-       tristate "AR7 Sangam ADSL Driver (Annex B)"
-       default y
-       depends BR2_LINUX_2_4_AR7
-       select BR2_PACKAGE_KMOD_ATM
-       help
-         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
+source "target/linux/*-2.[46]/Config.in"
 
-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
+comment "Kernel modules"
 
-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
+menu "Networking modules"
 
-config BR2_PACKAGE_KMOD_ARPT
-       tristate "ARP firewalling support"
+config PACKAGE_KMOD_ATM
+       prompt "kmod-atm.......................... ATM support"
+       tristate
+       default y if LINUX_2_4_AR7
        default m
        help
-         Kernel modules for ARP firewalling
+         ATM support
 
-config BR2_PACKAGE_KMOD_EBT
-       tristate "Ethernet Bridge firewalling support"
+config PACKAGE_KMOD_GRE
+       prompt "kmod-gre.......................... GRE tunneling driver"
+       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
-
-config BR2_PACKAGE_KMOD_IPTABLES_V4_EXTRA
-       tristate "Extra modules for iptables"
+         Kernel support for GRE tunnels
+       
+config PACKAGE_KMOD_IPIP
+       prompt "kmod-ipip......................... IP in IP encapsulation support"
+       tristate
        default m
        help
-         Extra kernel modules for IPv4 firewalling
+         Kernel module for IP in IP encapsulation
 
-config BR2_PACKAGE_KMOD_IPV6
-       tristate "IPv6 support"
+config PACKAGE_KMOD_IPV6
+       prompt "kmod-ipv6......................... IPv6 support"
+       tristate
        default m
        help
          Kernel modules for IPv6 protocol support
-         
-config BR2_PACKAGE_KMOD_IPTABLES_V6
-       tristate "Kernel modules for ip6tables"
-       default m
-       depends BR2_PACKAGE_KMOD_IPV6
-       help
-         IPv6 firewalling support
-
-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)
-
-config BR2_PACKAGE_KMOD_LOOP
-       tristate "loop mount support"
-       default m
-       help
-         Kernel module for loop mount support
 
-config BR2_PACKAGE_KMOD_NBD
-       tristate "network block device"
+config PACKAGE_KMOD_RING
+       prompt "kmod-ring......................... PF Ring"
+       tristate
        default m
        help
-         Kernel module for network block device
+         PF Ring
 
-config BR2_PACKAGE_KMOD_LP
-       tristate "parallel port and lp support"
+config PACKAGE_KMOD_SCHED
+       prompt "kmod-sched........................ Traffic schedulers"
+       tristate
        default m
        help
-         Kernel modules for line printer and parallel port support
+         Kernel schedulers for IP traffic
 
-config BR2_PACKAGE_KMOD_CRYPTO
-       tristate "CryptoAPI modules"
+config PACKAGE_KMOD_TUN
+       prompt "kmod-tun.......................... Universal TUN/TAP driver"
+       tristate
        default m
-       select BUSYBOX_CONFIG_FEATURE_CHECK_TAINTED_MODULE
        help
-         Kernel modules for cryptographic algorithms
+         Kernel support for the TUN/TAP tunneling device
 
-config BR2_PACKAGE_KMOD_PPP
-       tristate "PPP support"
-       default m
-       help
-         Kernel support for PPP
+endmenu
 
-config BR2_PACKAGE_KMOD_MPPE
-       tristate "PPP MPPE/MPPC module"
-       default m
-       select BR2_PACKAGE_KMOD_CRYPTO
-       depends BR2_PACKAGE_KMOD_PPP
-       help
-         Support for Microsoft PPP Encryption/Compression
+menu "Block devices support"
 
-config BR2_PACKAGE_KMOD_PPPOE
-       tristate "PPPoE modules"
+config PACKAGE_kmod-ide-core
+       prompt "kmod-ide-core..................... IDE support"
+       tristate
        default m
-       depends BR2_PACKAGE_KMOD_PPP
+       depends LINUX_2_4_X86 || LINUX_2_6_X86 || LINUX_2_4_BRCM || LINUX_2_6_BRCM
        help
-         Support for PPP over Ethernet
+         Kernel modules for IDE support
+         useful for usb mass storage devices (e.g. on WL-HDD)
+         
+         Includes:
+           - ide-core
+           - ide-detect
+           - ide-disk
 
-config BR2_PACKAGE_KMOD_PPPOATM
-       tristate "PPP over ATM"
-       default y if BR2_LINUX_2_4_AR7
+config PACKAGE_kmod-ide-pdc202xx
+       prompt "kmod-ide-pdc202xx................. PDC202xx driver"
+       tristate
        default m
-       depends BR2_PACKAGE_KMOD_PPP
-       select BR2_PACKAGE_KMOD_ATM
-       help
-         Support for PPP over ATM
-
-config BR2_PACKAGE_KMOD_ATM
-       tristate "ATM support"
-       default y if BR2_LINUX_2_4_AR7
+       depends PACKAGE_kmod-ide-core
+       depends LINUX_2_4_X86 || LINUX_2_6_X86 || LINUX_2_4_BRCM || LINUX_2_6_BRCM
        help
-         ATM support
+         Kernel modules for IDE support
+         useful for usb mass storage devices (e.g. on WL-HDD)
+         
+         Includes:
+           - ide-core
+           - ide-detect
+           - ide-disk
 
-config BR2_PACKAGE_KMOD_TUN
-       tristate "Universal TUN/TAP driver"
+config PACKAGE_KMOD_LOOP
+       prompt "kmod-loop......................... Loop mount support"
+       tristate
        default m
        help
-         Kernel support for the TUN/TAP tunneling device
+         Kernel module for loop mount support
 
-config BR2_PACKAGE_KMOD_GRE
-       tristate "GRE tunneling driver"
+config PACKAGE_KMOD_NBD
+       prompt "kmod-nbd.......................... Network Block Device"
+       tristate
        default m
        help
-         Kernel support for GRE tunnels
+         Kernel module for network block device
 
-config BR2_PACKAGE_KMOD_SCHED
-       tristate "Traffic schedulers"
-       default m
-       help
-         Kernel schedulers for IP traffic
+endmenu
 
-comment "Filesystems support -----------"
+menu "Filesystems support"
 
-config BR2_PACKAGE_KMOD_CIFS
-       tristate "kmod-fs-cifs................... CIFS support"
+config PACKAGE_KMOD_FS_CIFS
+       prompt "kmod-fs-cifs...................... CIFS support"
+       tristate
        default m
        help
          Kernel modules for CIFS support
 
-config BR2_PACKAGE_KMOD_FS_EXT2
-       tristate "kmod-fs-ext2................... EXT2 filesystem support"
+config PACKAGE_KMOD_FS_EXT2
+       prompt "kmod-fs-ext2...................... EXT2 filesystem support"
+       tristate
        default m
        help
          Kernel modules for EXT2 filesystem support
 
-config BR2_PACKAGE_KMOD_FS_EXT3
-       tristate "kmod-fs-ext3................... EXT3 filesystem support"
+config PACKAGE_KMOD_FS_EXT3
+       prompt "kmod-fs-ext3...................... EXT3 filesystem support"
+       tristate
        default m
        help
          Kernel modules for EXT3 filesystem support
 
-config BR2_PACKAGE_KMOD_FS_HFSPLUS
-       tristate "kmod-fs-hfsplus................ HFS+ filesystem support"
+config PACKAGE_KMOD_FS_HFSPLUS
+       prompt "kmod-fs-hfsplus................... HFS+ filesystem support"
+       tristate
        default m
        help
          Kernel modules for HFS+ filesystem support
 
-config BR2_PACKAGE_KMOD_FS_NFS
-       tristate "kmod-fs-nfs.................... NFS support"
+config PACKAGE_KMOD_FS_NFS
+       prompt "kmod-fs-nfs....................... NFS support"
+       tristate
        default m
        help
          Kernel modules for NFS support
          Includes lockd, nfs and sunrpc
 
-config BR2_PACKAGE_KMOD_FS_VFAT
-       tristate "kmod-fs-vfat................... VFAT filesystem support"
+config PACKAGE_KMOD_FS_VFAT
+       prompt "kmod-fs-vfat...................... VFAT filesystem support"
+       tristate
        default m
        help
          Kernel modules for VFAT filesystem support
          useful for usb mass storage devices
 
-config BR2_PACKAGE_KMOD_FS_XFS
-       tristate "kmod-fs-xfs.................... XFS filesystem support"
+config PACKAGE_KMOD_FS_XFS
+       prompt "kmod-fs-xfs....................... XFS filesystem support"
+       tristate
        default m
        help
          Kernel modules for XFS filesystem support
 
-comment "Multimedia devices support ----"
+endmenu
+
+menu "Multimedia devices support"
 
-config BR2_PACKAGE_KMOD_PWC
-       tristate "kmod-pwc....................... Kernel driver for USB Philips Cameras"
+config PACKAGE_KMOD_PWC
+       prompt "kmod-pwc.......................... Kernel driver for USB Philips Cameras"
+       tristate
+       depends PACKAGE_KMOD_USB
        default m
 
-config BR2_PACKAGE_KMOD_SOUNDCORE
-       tristate "kmod-soundcore................. Soundcard support"
+config 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
-       tristate "kmod-videodev.................. Video (For Linux) kernel support"
+config PACKAGE_KMOD_VIDEODEV
+       prompt "kmod-videodev..................... Video (For Linux) kernel support"
+       tristate
        default m
 
-comment "Native Language support -------"
+endmenu
 
-config BR2_PACKAGE_KMOD_NLS_CP437
-       tristate "kmod-nls-cp437................. Codepage 437 (United States, Canada)"
+menu "Native Language support"
+
+config PACKAGE_KMOD_NLS_BASE
+       prompt "kmod-nls-base..................... Native Language support"
+       tristate
        default m
-       select BR2_PACKAGE_KMOD_NLS
        help
          Kernel native language support
 
-config BR2_PACKAGE_KMOD_NLS_CP850
-       tristate "kmod-nls-cp850................. Codepage 850 (Europe)"
+config PACKAGE_KMOD_NLS_CP437
+       prompt   "kmod-nls-cp437.................. Codepage 437 (United States, Canada)"
+       tristate
        default m
-       select BR2_PACKAGE_KMOD_NLS
+       depends 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 PACKAGE_KMOD_NLS_CP850
+       prompt   "kmod-nls-cp850.................. Codepage 850 (Europe)"
+       tristate
        default m
-       select BR2_PACKAGE_KMOD_NLS
+       depends 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 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
+       depends PACKAGE_KMOD_NLS_BASE
        help
          Kernel native language support
 
-config BR2_PACKAGE_KMOD_NLS_UTF8
-       tristate "kmod-nls-utf8.................. NLS UTF8"
+config 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
+       depends PACKAGE_KMOD_NLS_BASE
        help
          Kernel native language support
 
-config BR2_PACKAGE_KMOD_NLS
+config PACKAGE_KMOD_NLS_UTF8
+       prompt   "kmod-nls-utf8................... NLS UTF8"
        tristate
        default m
-       depends BR2_PACKAGE_KMOD_NLS_CP437 || BR2_PACKAGE_KMOD_NLS_CP850 || BR2_PACKAGE_KMOD_NLS_IS08859_1 || BR2_PACKAGE_KMOD_NLS_IS08859_15 || BR2_PACKAGE_KMOD_NLS_UTF8
+       depends PACKAGE_KMOD_NLS_BASE
        help
          Kernel native language support
 
-comment "Network devices support -------"
+endmenu
+
+menu "Network devices support"
+       depends LINUX_2_4_X86 || LINUX_2_6_X86
 
-config BR2_PACKAGE_KMOD_NET_3C59X
-       tristate "kmod-net-3C59x................. 3Com 3c590/3c900 series (592/595/597) \"Vortex/Boomerang\" Ethernet kernel support"
+config PACKAGE_KMOD_NET_3C59X
+       prompt "kmod-net-3c59x.................... 3Com 3c590/3c900 series (592/595/597) \"Vortex/Boomerang\" Ethernet kernel support"
+       tristate
+       depends LINUX_2_4_X86 || LINUX_2_6_X86
        default m
        help
          This option enables driver support for a large number of 10mbps and 
@@ -323,22 +253,20 @@ 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"
+config PACKAGE_KMOD_NET_8139TOO
+       prompt "kmod-net-8139too.................. RealTek RTL-8139 PCI Fast Ethernet Adapter kernel support"
+       tristate
+       depends LINUX_2_4_X86 || LINUX_2_6_X86
        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"
+config PACKAGE_KMOD_NET_AIRO
+       prompt "kmod-net-airo..................... Cisco/Aironet 34X/35X/4500/4800 ISA and PCI cards kernel support"
+       tristate
+       depends LINUX_2_4_X86 || LINUX_2_6_X86
        default m
        help
          This is the standard Linux driver to support Cisco/Aironet ISA and 
@@ -350,20 +278,19 @@ 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_B44
-       tristate "kmod-net-b44................... Broadcom 44XX, 47XX ethernet driver"
+config PACKAGE_KMOD_NET_E100
+       prompt "kmod-net-e100..................... Intel(R) PRO/100+ cards kernel support"
+       tristate
+       depends LINUX_2_4_X86 || LINUX_2_6_X86
        default m
-       default y if BR2_LINUX_2_6_BRCM
        help
-         Free driver for Broadcom Ethernet chipsets (without switch support)
-         
+         Intel(R) PRO/100+ cards kernel support
 
-config BR2_PACKAGE_KMOD_NET_HERMES
-       tristate "kmod-net-hermes................ Hermes chipset 802.11b support (Orinoco/Prism2/Symbol) kernel support"
+config PACKAGE_KMOD_NET_HERMES
+       prompt "kmod-net-hermes................... Hermes chipset 802.11b support (Orinoco/Prism2/Symbol) kernel support"
+       tristate
+       depends LINUX_2_4_X86 || LINUX_2_6_X86
        default m
        help
          A driver for 802.11b wireless cards based based on the "Hermes" or 
@@ -375,28 +302,24 @@ 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"
+config PACKAGE_KMOD_NET_HERMES_PCI
+       prompt   "kmod-net-hermes-pci............. Intersil Prism 2.5 PCI 802.11b adaptor support"
+       tristate
        default m
-       depends BR2_PACKAGE_KMOD_NET_HERMES
+       depends PACKAGE_KMOD_NET_HERMES
        help
          Enable support for PCI and mini-PCI 802.11b wireless NICs based on 
          the Prism 2.5 chipset.  These are true PCI cards, not the 802.11b 
          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"
+config PACKAGE_KMOD_NET_HERMES_PLX
+       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
+       depends PACKAGE_KMOD_NET_HERMES
        help
          Enable support for PCMCIA cards supported by the "Hermes" (aka 
          orinoco_cs) driver when used in PLX9052 based PCI adaptors.  These 
@@ -404,23 +327,21 @@ 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"
+config PACKAGE_KMOD_NET_NATSEMI
+       prompt "kmod-net-natsemi.................. National Semiconductor DP8381x series PCI Ethernet kernel support"
+       tristate
+       depends LINUX_2_4_X86 || LINUX_2_6_X86
        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"
+config PACKAGE_KMOD_NET_PRISM54
+       prompt "kmod-net-prism54.................. Intersil Prism GT/Duette/Indigo PCI/PCMCIA cards kernel support"
+       tristate
+       depends LINUX_2_4_X86 || LINUX_2_6_X86 || LINUX_2_4_BRCM || LINUX_2_6_BRCM
        default m
        help
          Enable PCI and Cardbus support for the following chipset based cards: 
@@ -455,112 +376,178 @@ config BR2_PACKAGE_KMOD_NET_PRISM54
          <http://prism54.org>.
          
          Note: You need a motherboard with DMA support to use any of these cards.
-         
-         This package contains the prism54.o kernel module.
-         
 
-comment "USB support -------------------"
+endmenu
+
+menu "PCMCIA/CardBus support"
+       depends LINUX_2_4_X86 || LINUX_2_6_X86 || LINUX_2_4_BRCM || LINUX_2_6_BRCM
 
-config BR2_PACKAGE_KMOD_USB
-       tristate "kmod-usb....................... USB support"
+config PACKAGE_KMOD_PCMCIA_CORE
+       prompt "kmod-pcmcia-core.................. PCMCIA/CardBus support"
+       depends LINUX_PCMCIA_SUPPORT
+       tristate
+       depends LINUX_2_4_X86 || LINUX_2_6_X86 || LINUX_2_4_BRCM || LINUX_2_6_BRCM
        default m
 
-config BR2_PACKAGE_KMOD_USB_UHCI
-       tristate   "kmod-usb-uhci................ Support for UHCI controllers"
+config PACKAGE_KMOD_PCMCIA_SERIAL
+       prompt   "kmod-pcmcia-serial.............. PCMCIA/CardBus serial device support"
+       tristate
        default m
-       depends BR2_PACKAGE_KMOD_USB
-       select BR2_PACKAGE_KMOD_USB_CONTROLLER
+       depends PACKAGE_KMOD_PCMCIA_CORE
 
-config BR2_PACKAGE_KMOD_USB_OHCI
-       tristate   "kmod-usb-ohci................ Support for OHCI controllers"
+endmenu
+
+menu "USB support"
+
+config PACKAGE_KMOD_USB
+       prompt "kmod-usb-core..................... USB support"
+       tristate
+       default n if LINUX_2_4_AR531X
        default m
-       depends BR2_PACKAGE_KMOD_USB
-       select BR2_PACKAGE_KMOD_USB_CONTROLLER
 
-config BR2_PACKAGE_KMOD_USB2
-       tristate   "kmod-usb2.................... Support for USB 2.0 controllers"
+config PACKAGE_KMOD_USB_UHCI 
+       prompt   "kmod-usb-uhci................... Support for UHCI controllers"
+       tristate
+       default n if LINUX_2_6_AU1000
+       depends PACKAGE_KMOD_USB
+       select PACKAGE_KMOD_USB_CONTROLLER
+
+config 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
+       depends PACKAGE_KMOD_USB
+       select PACKAGE_KMOD_USB_CONTROLLER
 
-config BR2_PACKAGE_KMOD_USB_CONTROLLER
+config PACKAGE_KMOD_USB2
+       prompt   "kmod-usb2....................... Support for USB 2.0 controllers"
        tristate
-       depends on BR2_PACKAGE_KMOD_USB_UHCI || BR2_PACKAGE_KMOD_USB_OHCI || BR2_PACKAGE_KMOD_USB2
+       default n if LINUX_2_6_AU1000
+       depends PACKAGE_KMOD_USB
+       select PACKAGE_KMOD_USB_CONTROLLER
+
+config PACKAGE_KMOD_USB_CONTROLLER
+       tristate
+       depends on PACKAGE_KMOD_USB_UHCI || PACKAGE_KMOD_USB_OHCI || PACKAGE_KMOD_USB2
        default n
 
-config BR2_PACKAGE_KMOD_USB_ACM
-       tristate "kmod-usb-acm................... Support for USB modems/isdn controllers"
+config PACKAGE_KMOD_USB_ACM
+       prompt "kmod-usb-acm...................... Support for USB modems/isdn controllers"
+       tristate
        default m
-       depends BR2_PACKAGE_KMOD_USB_CONTROLLER
+       depends PACKAGE_KMOD_USB_CONTROLLER
 
-config BR2_PACKAGE_KMOD_USB_AUDIO
-       tristate "kmod-usb-audio................. Support for USB soundcards"
+config 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
+       depends PACKAGE_KMOD_USB_CONTROLLER
+       select PACKAGE_KMOD_SOUNDCORE
 
-config BR2_PACKAGE_KMOD_USB_PRINTER
-       tristate "kmod-usb-printer............... Support for USB printers"
+config PACKAGE_KMOD_USB_PRINTER
+       prompt "kmod-usb-printer.................. Support for USB printers"
+       tristate
        default m
-       depends BR2_PACKAGE_KMOD_USB_CONTROLLER
+       depends PACKAGE_KMOD_USB_CONTROLLER
 
-config BR2_PACKAGE_KMOD_USB_SERIAL
-       tristate "kmod-usb-serial................ Support for USB-to-serial converters"
+config PACKAGE_KMOD_USB_SERIAL
+       prompt "kmod-usb-serial................... Support for USB-to-serial converters"
+       tristate
        default m
-       depends BR2_PACKAGE_KMOD_USB_CONTROLLER
+       depends PACKAGE_KMOD_USB_CONTROLLER
 
-config BR2_PACKAGE_KMOD_USB_SERIAL_BELKIN
-       tristate   "kmod-usb-serial-belkin....... Support for Belkin USB-to-serial converters"
+config 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
+       depends PACKAGE_KMOD_USB_SERIAL
 
-config BR2_PACKAGE_KMOD_USB_SERIAL_FTDI
-       tristate   "kmod-usb-serial-ftdi......... Support for FTDI USB-to-serial converterr"
+config 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
+       depends 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"
+config 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
+       depends PACKAGE_KMOD_USB_SERIAL
 
-config BR2_PACKAGE_KMOD_USB_SERIAL_PL2303
-       tristate   "kmod-usb-serial-pl2303....... Support for Prolific PL2303 USB-to-Serial converters"
+config 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
+       depends PACKAGE_KMOD_USB_SERIAL
 
-config BR2_PACKAGE_KMOD_USB_STORAGE
-       tristate "kmod-usb-storage............... Support for USB storage devices"
+config PACKAGE_KMOD_USB_SERIAL_VISOR
+       prompt   "kmod-usb-serial-visor........... Support for Handspring Visor / Palm m50x / Sony Clie Driver"
+       tristate
        default m
-       depends BR2_PACKAGE_KMOD_USB_CONTROLLER
+       depends PACKAGE_KMOD_USB_SERIAL
 
-comment "Misc. device support ----------"
+config PACKAGE_KMOD_USB_STORAGE
+       prompt "kmod-usb-storage.................. Support for USB storage devices"
+       tristate
+       default m
+       depends PACKAGE_KMOD_USB_CONTROLLER
 
-config BR2_PACKAGE_KMOD_AX25
-       tristate "kmod-ax25...................... AX25 support"
+config PACKAGE_KMOD_USB_ATM
+        prompt "kmod-usb-atm...................... Support for USB ATM devices"
+       tristate
+       default m
+       depends PACKAGE_KMOD_USB_CONTROLLER
+
+config PACKAGE_KMOD_USB_ATM_SPEEDTOUCH
+        prompt   "kmod-usb-atm-speedtouch......... Support for USB Speedtouch ADSL modem"
+       tristate
+       default m
+       depends PACKAGE_KMOD_USB_ATM
+
+endmenu
+
+menu "Misc. devices support"
+
+config PACKAGE_KMOD_AX25
+       prompt "kmod-ax25......................... AX25 support"
+       tristate
        default m
        help
          Kernel modules for AX25 protocol family
-          - ax25.o: AX25 layer 2 support
-          - mkiss.o: AX25 KISS driver
          
+         This package contains both the AX25 layer 2 support (ax25) and AX25 KISS driver (mkiss)
 
-config BR2_PACKAGE_KMOD_BLUETOOTH
-       tristate "kmod-bluetooth................. Bluetooth drivers and network stack"
+config PACKAGE_KMOD_BLUETOOTH
+       prompt "kmod-bluetooth.................... Bluetooth drivers and network stack"
+       tristate
        default m
+       default n if LINUX_2_4_AR531X
        help
          Bluetooth drivers and network stack
-         
 
-config BR2_PACKAGE_KMOD_WD1100
-       tristate "kmod-wd1100.................... Soekris net4801 watchdog"
+config 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 PACKAGE_KMOD_SOFTDOG
+       prompt "kmod-softdog...................... Software watchdog"
+       tristate
+       default m
+       help
+         Kernel modules for software watchdog driver
+
+config PACKAGE_KMOD_WD1100
+       prompt "kmod-wd1100....................... Soekris net4801 watchdog"
+       tristate
        default y
-       depends BR2_LINUX_2_4_X86
+       depends LINUX_2_4_X86
        help
          Driver for the NatSemi SC1x00 series Watchdog 
          found on Soekris net4801 boards
-         
 
-comment "Additional kernel modules -----"
+endmenu
 
-source "target/linux/package/Config.in"
+endmenu