Added support for Eagle 8051 based USB ADSL modems (such as the Sagem F@st800)

[openwrt.git] / target / linux / Config.in

diff --git a/target/linux/Config.in b/target/linux/Config.in
index 5fca0f0..9ccb11b 100644 (file)
--- a/target/linux/Config.in
+++ b/target/linux/Config.in
@@ -5,6 +5,7 @@ config BR2_LINUX_2_4_BRCM
        bool "Support for Broadcom based routers [2.4]"
        default y
        depends BR2_mipsel
        bool "Support for Broadcom based routers [2.4]"
        default y
        depends BR2_mipsel

+       select BR2_LINUX_PCMCIA_SUPPORT

        help
          Build firmware images for Broadcom based routers
          (e.g. Linksys WRT54G(S), Asus WL-500g, Motorola WR850G)
        help
          Build firmware images for Broadcom based routers
          (e.g. Linksys WRT54G(S), Asus WL-500g, Motorola WR850G)


@@ -24,306 +25,498 @@ config BR2_LINUX_2_4_X86
        bool "Support for x86 boards [2.4]"
        default n
        depends BR2_i386
        bool "Support for x86 boards [2.4]"
        default n
        depends BR2_i386

+       select BR2_LINUX_PCMCIA_SUPPORT

        help
          Build firmware images for x86 based boards
          (e.g. Soekris net4521 and net4801, PC Engines WRAP...)
        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
 config BR2_LINUX_2_6_BRCM
        bool "Support for Broadcom based routers [2.6]"
        default n
        depends BR2_mipsel

+       select BR2_LINUX_PCMCIA_SUPPORT

        help
          Build firmware images for Broadcom based routers
          (e.g. Netgear WGT634u)
        help
          Build firmware images for Broadcom based routers
          (e.g. Netgear WGT634u)

-       
+
+config BR2_LINUX_2_6_X86
+       bool "Support for x86 boards [2.6]"
+       default n
+       depends BR2_i386
+       select BR2_LINUX_PCMCIA_SUPPORT
+       help
+         Build firmware images for x86 based boards
+         (e.g. Soekris net4521 and net4801, PC Engines WRAP...)
+
+config BR2_LINUX_2_4_AR531X
+       bool "Support for Atheros ar531x based APs"
+       default n
+       depends BR2_mips
+       help
+         Build firmware images for Atheros ar531x based boards
+         (e.g. Netgear WGT624, Linksys WRT55AG)
+

 endchoice
 endchoice

-       
-comment "Kernel Modules"

 
 

-config BR2_PACKAGE_KMOD_SANGAM_ATM_A
-       tristate "AR7 Sangam ADSL Driver (Annex A)"
+
+config BR2_LINUX_PCMCIA_SUPPORT
+       bool
+       default n
+       depends BR2_LINUX_2_4_X86 || BR2_LINUX_2_4_BRCM || BR2_LINUX_2_6_X86 || BR2_LINUX_2_6_BRCM
+
+
+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 m
        default m

-       depends BR2_LINUX_2_4_AR7
-       select BR2_PACKAGE_KMOD_ATM

        help
        help

-         ATM driver for the Sangam ADSL chip on AR7
-         Annex A version
+         Proprietary driver for Broadcom Ethernet chipsets (obsolete)

 
 

-config BR2_PACKAGE_KMOD_SANGAM_ATM_B
-       tristate "AR7 Sangam ADSL Driver (Annex B)"
+config BR2_PACKAGE_KMOD_BRCM_WL
+       prompt "kmod-brcm-wl...................... Broadcom Wireless Network Driver"
+       tristate
+       depends BR2_LINUX_2_4_BRCM

        default y
        default y

-       depends BR2_LINUX_2_4_AR7
-       select BR2_PACKAGE_KMOD_ATM

        help
        help

-         ATM driver for the Sangam ADSL chip on AR7
-         Annex B version
+         Proprietary driver for Broadcom Wireless chipsets
+
+config BR2_PACKAGE_KMOD_BRCM_WL2
+       prompt "kmod-brcm-wl2..................... Broadcom Wireless Network Driver (new)"
+       tristate
+       depends BR2_LINUX_2_4_BRCM
+       default m
+       help
+         Proprietary driver for Broadcom Wireless chipsets
+         New version with Multi-BSS capability

 
 config BR2_PACKAGE_KMOD_CPMAC
 
 config BR2_PACKAGE_KMOD_CPMAC

-       tristate "AR7 CPMAC Network Driver"
+       prompt "kmod-cpmac........................ AR7 CPMAC Network Driver"
+       tristate

        default y
        depends BR2_LINUX_2_4_AR7
        help
          Driver for the AR7 CPMAC network chip
 
        default y
        depends BR2_LINUX_2_4_AR7
        help
          Driver for the AR7 CPMAC network chip
 

-config BR2_PACKAGE_KMOD_BRCM_WL
-       tristate "Broadcom Wireless Network Driver"
-       depends BR2_LINUX_2_4_BRCM
-       default y
+config BR2_PACKAGE_KMOD_SANGAM_ATM_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

        help
        help

-         Proprietary driver for Broadcom Wireless chipsets
+         ATM driver for the Sangam ADSL chip on AR7
+         Annex A version

 
 

-config BR2_PACKAGE_KMOD_BRCM_ET
-       tristate "Broadcom Ethernet Driver"
-       depends BR2_LINUX_2_4_BRCM
+config BR2_PACKAGE_KMOD_SANGAM_ATM_B
+       prompt "kmod-sangam-atm-annex-b........... AR7 Sangam ADSL Driver (Annex B)"
+       tristate

        default y
        default y

+       depends BR2_LINUX_2_4_AR7
+       select BR2_PACKAGE_KMOD_ATM

        help
        help

-         Proprietary driver for Broadcom Ethernet chipsets
+         ATM driver for the Sangam ADSL chip on AR7
+         Annex B version

 
 

-comment "Networking modules ------------"
+comment "Networking modules"

 
 config BR2_PACKAGE_KMOD_ATM
 
 config BR2_PACKAGE_KMOD_ATM

-       tristate "kmod-atm....................... ATM support"
+       prompt "kmod-atm.......................... ATM support"
+       tristate

        default y if BR2_LINUX_2_4_AR7
        help
          ATM support
 
 config BR2_PACKAGE_KMOD_GRE
        default y if BR2_LINUX_2_4_AR7
        help
          ATM support
 
 config BR2_PACKAGE_KMOD_GRE

-       tristate "kmod-gre....................... GRE tunneling driver"
+       prompt "kmod-gre.......................... GRE tunneling driver"
+       tristate

        default m
        help
          Kernel support for GRE tunnels
 
 config BR2_PACKAGE_KMOD_IPV6
        default m
        help
          Kernel support for GRE tunnels
 
 config BR2_PACKAGE_KMOD_IPV6

-       tristate "kmod-ipv6...................... IPv6 support"
+       prompt "kmod-ipv6......................... IPv6 support"
+       tristate

        default m
        help
          Kernel modules for IPv6 protocol support
        default m
        help
          Kernel modules for IPv6 protocol support

-         
+

 config BR2_PACKAGE_KMOD_PPP
 config BR2_PACKAGE_KMOD_PPP

-       tristate "kmod-ppp....................... PPP support"
+       prompt "kmod-ppp.......................... PPP support"
+       tristate

        default m
        help
          Kernel support for PPP
 
 config BR2_PACKAGE_KMOD_MPPE
        default m
        help
          Kernel support for PPP
 
 config BR2_PACKAGE_KMOD_MPPE

-       tristate   "kmod-mppe.................... PPP MPPE/MPPC module"
+       prompt   "kmod-mppe....................... PPP MPPE/MPPC module"
+       tristate

        default m
        depends BR2_PACKAGE_KMOD_PPP
        select BR2_PACKAGE_KMOD_CRYPTO
        help
          Support for Microsoft PPP Encryption/Compression
 
        default m
        depends BR2_PACKAGE_KMOD_PPP
        select BR2_PACKAGE_KMOD_CRYPTO
        help
          Support for Microsoft PPP Encryption/Compression
 

+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
+         Support for PPP over ATM
+

 config BR2_PACKAGE_KMOD_PPPOE
 config BR2_PACKAGE_KMOD_PPPOE

-       tristate   "kmod-pppoe................... PPPoE (PPP over Ethernet) kernel support"
+       prompt   "kmod-pppoe...................... PPPoE (PPP over Ethernet) kernel support"
+       tristate

        default m
        depends BR2_PACKAGE_KMOD_PPP
        help
          Support for PPP over Ethernet
 
        default m
        depends BR2_PACKAGE_KMOD_PPP
        help
          Support for PPP over Ethernet
 

-config BR2_PACKAGE_KMOD_PPPOATM
-       tristate   "kmod-pppoatm................. PPPoA (PPP over ATM) kernel support"
-       default y if BR2_LINUX_2_4_AR7
+config BR2_PACKAGE_KMOD_RING
+       prompt "kmod-ring......................... PF Ring"
+       tristate

        default m
        default m

-       depends BR2_PACKAGE_KMOD_PPP
-       select BR2_PACKAGE_KMOD_ATM

        help
        help

-         Support for PPP over ATM
+         PF Ring

 
 config BR2_PACKAGE_KMOD_SCHED
 
 config BR2_PACKAGE_KMOD_SCHED

-       tristate "kmod-sched..................... Traffic schedulers"
+       prompt "kmod-sched........................ Traffic schedulers"
+       tristate

        default m
        help
          Kernel schedulers for IP traffic
 
 config BR2_PACKAGE_KMOD_TUN
        default m
        help
          Kernel schedulers for IP traffic
 
 config BR2_PACKAGE_KMOD_TUN

-       tristate "kmod-tun....................... Universal TUN/TAP driver"
+       prompt "kmod-tun.......................... Universal TUN/TAP driver"
+       tristate

        default m
        help
          Kernel support for the TUN/TAP tunneling device
 
        default m
        help
          Kernel support for the TUN/TAP tunneling device
 

-
-comment "Filtering/Firewalling ---------"
+comment "Filtering/Firewalling"

 
 config BR2_PACKAGE_KMOD_ARPTABLES
 
 config BR2_PACKAGE_KMOD_ARPTABLES

-       tristate "kmod-arptables................. ARP firewalling support"
+       prompt "kmod-arptables.................... ARP firewalling support"
+       tristate

        default m
        help
          Kernel modules for ARP firewalling
 
 config BR2_PACKAGE_KMOD_EBTABLES
        default m
        help
          Kernel modules for ARP firewalling
 
 config BR2_PACKAGE_KMOD_EBTABLES

-       tristate "kmod-ebtables.................. Ethernet Bridge firewalling support"
+       prompt "kmod-ebtables..................... Ethernet Bridge firewalling support"
+       tristate

        default m
        help
          Kernel modules for bridge firewalling
 
        default m
        help
          Kernel modules for bridge firewalling
 

-config BR2_PACKAGE_KMOD_IPTABLES_V4
-       tristate "kmod-iptables.................. Basic set of kernel modules for iptables"
+config BR2_PACKAGE_KMOD_IPTABLES
+       prompt "kmod-iptables..................... Core Netfilter modules for IPv4 firewalling"
+       tristate

        default y
        help
          Kernel modules for IPv4 firewalling
 
        default y
        help
          Kernel modules for IPv4 firewalling
 

-config BR2_PACKAGE_KMOD_IPTABLES_V4_EXTRA
-       tristate "kmod-iptables-extra............ Extra modules for iptables"
+config BR2_PACKAGE_KMOD_IPTABLES_EXTRA
+       prompt "kmod-iptables-extra............... Extra Netfilter modules for IPv4 firewalling (meta-package)"
+       tristate
+       default m
+       select BR2_PACKAGE_KMOD_IPT_CONNTRACK
+       select BR2_PACKAGE_KMOD_IPT_FILTER
+       select BR2_PACKAGE_KMOD_IPT_IPOPT
+       select BR2_PACKAGE_KMOD_IPT_IPSEC
+       select BR2_PACKAGE_KMOD_IPT_NAT
+       select BR2_PACKAGE_KMOD_IPT_NAT_EXTRA
+       select BR2_PACKAGE_KMOD_IPT_QUEUE
+       select BR2_PACKAGE_KMOD_IPT_ULOG
+       select BR2_PACKAGE_KMOD_IPT_EXTRA
+       help
+         Extra Netfilter kernel modules for IPv4 firewalling (meta-package)
+
+config BR2_PACKAGE_KMOD_IPT_CONNTRACK
+       prompt "kmod-ipt-conntrack................ Netfilter modules for connection tracking"
+       tristate

        default m
        help
        default m
        help

-         Extra kernel modules for IPv4 firewalling
+         Netfilter (IPv4) kernel modules for connection tracking

 
 

-config BR2_PACKAGE_KMOD_IPTABLES_V6
-       tristate "kmod-ip6tables................. Kernel modules for ip6tables"
+         Includes:
+           * ipt_conntrack
+           * ipt_helper
+           * ipt_connmark/CONNMARK
+
+config BR2_PACKAGE_KMOD_IPT_FILTER
+       prompt "kmod-ipt-filter................... Netfilter modules for packet content inspection"
+       tristate
+       default m
+       help
+         Netfilter (IPv4) kernel modules for packet content inspection
+
+         Includes:
+           * ipt_ipp2p
+           * ipt_layer7
+
+config BR2_PACKAGE_KMOD_IPT_IPOPT
+       prompt "kmod-ipt-ipopt.................... Netfilter modules for matching/changing IP packet options"
+       tristate
+       default m
+       help
+         Netfilter (IPv4) kernel modules for matching/changing IP packet options
+         
+         Includes:
+           * ipt_dscp/DSCP
+           * ipt_ecn/ECN
+           * ipt_length
+           * ipt_mac
+           * ipt_tos/TOS
+           * ipt_tcpmms
+           * ipt_ttl/TTL
+           * ipt_unclean
+
+config BR2_PACKAGE_KMOD_IPT_IPSEC
+       prompt "kmod-ipt-ipsec.................... Netfilter modules for matching IPsec packets"
+       tristate
+       default m
+       help
+         Netfilter (IPv4) kernel modules for matching IPsec packets
+         
+         Includes:
+           * ipt_ah
+           * ipt_esp
+
+config BR2_PACKAGE_KMOD_IPT_NAT
+       prompt "kmod-ipt-nat...................... Netfilter modules for different NAT targets"
+       tristate
+       default m
+       help
+         Netfilter (IPv4) kernel modules for different NAT targets
+
+         Includes: 
+           * ipt_REDIRECT
+
+config BR2_PACKAGE_KMOD_IPT_NAT_EXTRA
+       prompt "kmod-ipt-nat-extra................ Extra Netfilter NAT modules for special protocols"
+       tristate
+       default m
+       help
+         Extra Netfilter (IPv4) NAT kernel modules for special protocols
+         
+         Includes:
+           * ip_conntrack_amanda
+           * ip_conntrack_proto_gre
+           * ip_nat_proto_gre
+           * ip_conntrack_pptp
+           * ip_nat_pptp
+           * ip_nat_snmp_basic
+           * ip_conntrack_tftp
+
+config BR2_PACKAGE_KMOD_IPT_QUEUE
+       prompt "kmod-ipt-queue.................... Netfilter module for user-space packet queueing"
+       tristate
+       default m
+       help
+         Netfilter (IPv4) module for user-space packet queueing
+         
+         Includes:
+           * ipt_QUEUE
+
+config BR2_PACKAGE_KMOD_IPT_ULOG
+       prompt "kmod-ipt-ulog..................... Netfilter module for user-space packet logging"
+       tristate
+       default m
+       help
+         Netfilter (IPv4) module for user-space packet logging
+         
+         Includes:
+           * ipt_ULOG
+
+config BR2_PACKAGE_KMOD_IPT_EXTRA
+       prompt "kmod-ipt-extra.................... Other extra Netfilter modules"
+       tristate
+       default m
+       help
+         Other extra Netfilter (IPv4) kernel modules
+
+         Includes:
+           * ipt_limit
+           * ipt_owner
+           * ipt_physdev
+           * ipt_pkttype
+           * ipt_recent
+
+config BR2_PACKAGE_KMOD_IP6TABLES
+       prompt "kmod-ip6tables.................... Kernel modules for ip6tables"
+       tristate

        default m
        depends BR2_PACKAGE_KMOD_IPV6
        help
          IPv6 firewalling support
 
        default m
        depends BR2_PACKAGE_KMOD_IPV6
        help
          IPv6 firewalling support
 

-comment "Block devices support ---------"
+comment "Block devices support"

 
 config BR2_PACKAGE_KMOD_IDE
 
 config BR2_PACKAGE_KMOD_IDE

-       tristate "kmod-ide....................... IDE support"
+       prompt "kmod-ide.......................... IDE support"
+       tristate

        default m
        help
          Kernel modules for IDE support
          useful for usb mass storage devices (e.g. on WL-HDD)
        default m
        help
          Kernel modules for IDE support
          useful for usb mass storage devices (e.g. on WL-HDD)

-         

 
 config BR2_PACKAGE_KMOD_LOOP
 
 config BR2_PACKAGE_KMOD_LOOP

-       tristate "kmod-loop...................... loop mount support"
+       prompt "kmod-loop......................... Loop mount support"
+       tristate

        default m
        help
          Kernel module for loop mount support
        default m
        help
          Kernel module for loop mount support

-         

 
 config BR2_PACKAGE_KMOD_NBD
 
 config BR2_PACKAGE_KMOD_NBD

-       tristate "kmod-nbd....................... network block device"
+       prompt "kmod-nbd.......................... Network Block Device"
+       tristate

        default m
        help
          Kernel module for network block device
        default m
        help
          Kernel module for network block device

-         

 
 

-comment "Cryptographic support ---------"
+comment "Cryptographic support"

 
 config BR2_PACKAGE_KMOD_CRYPTO
 
 config BR2_PACKAGE_KMOD_CRYPTO

-       tristate "kmod-crypto.................... CryptoAPI modules"
+       prompt "kmod-crypto....................... CryptoAPI modules"
+       tristate

        default m
        select BUSYBOX_CONFIG_FEATURE_CHECK_TAINTED_MODULE
        help
          Kernel modules for cryptographic algorithms
        default m
        select BUSYBOX_CONFIG_FEATURE_CHECK_TAINTED_MODULE
        help
          Kernel modules for cryptographic algorithms

-         

 
 

-comment "Filesystems support -----------"
+comment "Filesystems support"

 
 config BR2_PACKAGE_KMOD_CIFS
 
 config BR2_PACKAGE_KMOD_CIFS

-       tristate "kmod-fs-cifs................... CIFS support"
+       prompt "kmod-fs-cifs...................... CIFS support"
+       tristate

        default m
        help
          Kernel modules for CIFS support
        default m
        help
          Kernel modules for CIFS support

-         

 
 config BR2_PACKAGE_KMOD_FS_EXT2
 
 config BR2_PACKAGE_KMOD_FS_EXT2

-       tristate "kmod-fs-ext2................... EXT2 filesystem support"
+       prompt "kmod-fs-ext2...................... EXT2 filesystem support"
+       tristate

        default m
        help
          Kernel modules for EXT2 filesystem support
        default m
        help
          Kernel modules for EXT2 filesystem support

-         

 
 config BR2_PACKAGE_KMOD_FS_EXT3
 
 config BR2_PACKAGE_KMOD_FS_EXT3

-       tristate "kmod-fs-ext3................... EXT3 filesystem support"
+       prompt "kmod-fs-ext3...................... EXT3 filesystem support"
+       tristate

        default m
        help
          Kernel modules for EXT3 filesystem support
        default m
        help
          Kernel modules for EXT3 filesystem support

-         

 
 config BR2_PACKAGE_KMOD_FS_HFSPLUS
 
 config BR2_PACKAGE_KMOD_FS_HFSPLUS

-       tristate "kmod-fs-hfsplus................ HFS+ filesystem support"
+       prompt "kmod-fs-hfsplus................... HFS+ filesystem support"
+       tristate

        default m
        help
          Kernel modules for HFS+ filesystem support
        default m
        help
          Kernel modules for HFS+ filesystem support

-         

 
 config BR2_PACKAGE_KMOD_FS_NFS
 
 config BR2_PACKAGE_KMOD_FS_NFS

-       tristate "kmod-fs-nfs.................... NFS support"
+       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
        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"
+       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
        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"
+       prompt "kmod-fs-xfs....................... XFS filesystem support"
+       tristate

        default m
        help
          Kernel modules for XFS filesystem support
 
        default m
        help
          Kernel modules for XFS filesystem support
 

-comment "Multimedia devices support ----"
+comment "Multimedia devices support"

 
 config BR2_PACKAGE_KMOD_PWC
 
 config BR2_PACKAGE_KMOD_PWC

-       tristate "kmod-pwc....................... Kernel driver for USB Philips Cameras"
+       prompt "kmod-pwc.......................... Kernel driver for USB Philips Cameras"
+       tristate

        default m
 
 config BR2_PACKAGE_KMOD_SOUNDCORE
        default m
 
 config BR2_PACKAGE_KMOD_SOUNDCORE

-       tristate "kmod-soundcore................. Soundcard support"
+       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
        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"
+       prompt "kmod-videodev..................... Video (For Linux) kernel support"
+       tristate

        default m
 
        default m
 

-comment "Native Language support -------"
+comment "Native Language support"

 
 

-config BR2_PACKAGE_KMOD_NLS_CP437
-       tristate "kmod-nls-cp437................. Codepage 437 (United States, Canada)"
+config BR2_PACKAGE_KMOD_NLS_BASE
+       prompt "kmod-nls-base..................... Native Language support"
+       tristate

        default m
        default m

-       select BR2_PACKAGE_KMOD_NLS

        help
          Kernel native language support
 
        help
          Kernel native language support
 

-config BR2_PACKAGE_KMOD_NLS_CP850
-       tristate "kmod-nls-cp850................. Codepage 850 (Europe)"
+config BR2_PACKAGE_KMOD_NLS_CP437
+       prompt   "kmod-nls-cp437.................. Codepage 437 (United States, Canada)"
+       tristate

        default m
        default m

-       select BR2_PACKAGE_KMOD_NLS
+       depends BR2_PACKAGE_KMOD_NLS_BASE

        help
          Kernel native language support
 
        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_CP850
+       prompt   "kmod-nls-cp850.................. Codepage 850 (Europe)"
+       tristate

        default m
        default m

-       select BR2_PACKAGE_KMOD_NLS
+       depends BR2_PACKAGE_KMOD_NLS_BASE

        help
          Kernel native language support
 
        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_1
+       prompt   "kmod-nls-iso8859-1.............. NLS ISO 8859-1 (Latin 1; Western European Languages)"
+       tristate

        default m
        default m

-       select BR2_PACKAGE_KMOD_NLS
+       depends BR2_PACKAGE_KMOD_NLS_BASE

        help
          Kernel native language support
 
        help
          Kernel native language support
 

-config BR2_PACKAGE_KMOD_NLS_UTF8
-       tristate "kmod-nls-utf8.................. NLS UTF8"
+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
        default m

-       select BR2_PACKAGE_KMOD_NLS
+       depends BR2_PACKAGE_KMOD_NLS_BASE

        help
          Kernel native language support
 
        help
          Kernel native language support
 

-config BR2_PACKAGE_KMOD_NLS
+config BR2_PACKAGE_KMOD_NLS_UTF8
+       prompt   "kmod-nls-utf8................... NLS UTF8"

        tristate
        default m
        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 BR2_PACKAGE_KMOD_NLS_BASE

        help
          Kernel native language support
 
        help
          Kernel native language support
 

-comment "Network devices support -------"
+comment "Network devices support"

 
 config BR2_PACKAGE_KMOD_NET_3C59X
 
 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 
        default m
        help
          This option enables driver support for a large number of 10mbps and 


@@ -334,22 +527,18 @@ config BR2_PACKAGE_KMOD_NET_3C59X
           * "Cyclone"   (3c540/3c900/3c905/3c980/3c575/3c656)    PCI and Cardbus
           * "Tornado"   (3c905)                                  PCI
           * "Hurricane" (3c555/3cSOHO)                           PCI
           * "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
 
 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.
        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
 
 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 
        default m
        help
          This is the standard Linux driver to support Cisco/Aironet ISA and 


@@ -361,20 +550,26 @@ 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 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 BR2_PACKAGE_KMOD_NET_E100
+       prompt "kmod-net-e100..................... Intel(R) PRO/100+ cards kernel support"
+       tristate

        default m
        default m

-       default y if BR2_LINUX_2_6_BRCM

        help
        help

-         Free driver for Broadcom Ethernet chipsets (without switch support)
-         
+         Intel(R) PRO/100+ cards kernel support
+
+config BR2_PACKAGE_KMOD_NET_B44
+       prompt "kmod-net-b44...................... Broadcom 44XX, 47XX ethernet driver"
+       tristate
+       depends !BR2_LINUX_2_6_BRCM
+       default y if BR2_LINUX_2_4_BRCM
+       default m
+       help
+         Free driver for Broadcom Ethernet chipsets

 
 config BR2_PACKAGE_KMOD_NET_HERMES
 
 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 
        default m
        help
          A driver for 802.11b wireless cards based based on the "Hermes" or 


@@ -386,12 +581,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.
          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
 
 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
        default m
        depends BR2_PACKAGE_KMOD_NET_HERMES
        help


@@ -400,12 +593,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.
          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
 
 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
        default m
        depends BR2_PACKAGE_KMOD_NET_HERMES
        help


@@ -415,23 +606,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.
          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
 
 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.
        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
 
 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: 
        default m
        help
          Enable PCI and Cardbus support for the following chipset based cards: 


@@ -466,30 +653,45 @@ config BR2_PACKAGE_KMOD_NET_PRISM54
          <http://prism54.org>.
          
          Note: You need a motherboard with DMA support to use any of these cards.
          <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 -------------------"
+comment "PCMCIA/CardBus support"
+
+config BR2_PACKAGE_KMOD_PCMCIA_CORE
+       prompt "kmod-pcmcia-core.................. PCMCIA/CardBus support"
+       depends BR2_LINUX_PCMCIA_SUPPORT
+       tristate
+       default m
+
+config BR2_PACKAGE_KMOD_PCMCIA_SERIAL
+       prompt   "kmod-pcmcia-serial.............. PCMCIA/CardBus serial device support"
+       tristate
+       default m
+       depends BR2_PACKAGE_KMOD_PCMCIA_CORE
+
+comment "USB support"

 
 config BR2_PACKAGE_KMOD_USB
 
 config BR2_PACKAGE_KMOD_USB

-       tristate "kmod-usb....................... USB support"
+       prompt "kmod-usb-core..................... USB support"
+       tristate

        default m
 
 config BR2_PACKAGE_KMOD_USB_UHCI
        default m
 
 config BR2_PACKAGE_KMOD_USB_UHCI

-       tristate   "kmod-usb-uhci................ Support for UHCI controllers"
+       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
        default m
        depends BR2_PACKAGE_KMOD_USB
        select BR2_PACKAGE_KMOD_USB_CONTROLLER
 
 config BR2_PACKAGE_KMOD_USB_OHCI

-       tristate   "kmod-usb-ohci................ Support for OHCI controllers"
+       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
        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"
+       prompt   "kmod-usb2....................... Support for USB 2.0 controllers"
+       tristate

        default m
        depends BR2_PACKAGE_KMOD_USB
        select BR2_PACKAGE_KMOD_USB_CONTROLLER
        default m
        depends BR2_PACKAGE_KMOD_USB
        select BR2_PACKAGE_KMOD_USB_CONTROLLER


@@ -500,85 +702,101 @@ config BR2_PACKAGE_KMOD_USB_CONTROLLER
        default n
 
 config BR2_PACKAGE_KMOD_USB_ACM
        default n
 
 config BR2_PACKAGE_KMOD_USB_ACM

-       tristate "kmod-usb-acm................... Support for USB modems/isdn controllers"
+       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
        default m
        depends BR2_PACKAGE_KMOD_USB_CONTROLLER
 
 config BR2_PACKAGE_KMOD_USB_AUDIO

-       tristate "kmod-usb-audio................. Support for USB soundcards"
+       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
        default m
        depends BR2_PACKAGE_KMOD_USB_CONTROLLER
        select BR2_PACKAGE_KMOD_SOUNDCORE
 
 config BR2_PACKAGE_KMOD_USB_PRINTER

-       tristate "kmod-usb-printer............... Support for USB printers"
+       prompt "kmod-usb-printer.................. Support for USB printers"
+       tristate

        default m
        depends BR2_PACKAGE_KMOD_USB_CONTROLLER
 
 config BR2_PACKAGE_KMOD_USB_SERIAL
        default m
        depends BR2_PACKAGE_KMOD_USB_CONTROLLER
 
 config BR2_PACKAGE_KMOD_USB_SERIAL

-       tristate "kmod-usb-serial................ Support for USB-to-serial converters"
+       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
        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"
+       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
        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"
+       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
        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"
+       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
        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"
+       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
        default m
        depends BR2_PACKAGE_KMOD_USB_SERIAL
 
 config BR2_PACKAGE_KMOD_USB_STORAGE

-       tristate "kmod-usb-storage............... Support for USB storage devices"
+       prompt "kmod-usb-storage.................. Support for USB storage devices"
+       tristate

        default m
        depends BR2_PACKAGE_KMOD_USB_CONTROLLER
 
        default m
        depends BR2_PACKAGE_KMOD_USB_CONTROLLER
 

-comment "Misc. device support ----------"
+comment "Misc. devices support"

 
 config BR2_PACKAGE_KMOD_AX25
 
 config BR2_PACKAGE_KMOD_AX25

-       tristate "kmod-ax25...................... AX25 support"
+       prompt "kmod-ax25......................... AX25 support"
+       tristate

        default m
        help
          Kernel modules for AX25 protocol family
        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
 
 config BR2_PACKAGE_KMOD_BLUETOOTH

-       tristate "kmod-bluetooth................. Bluetooth drivers and network stack"
+       prompt "kmod-bluetooth.................... Bluetooth drivers and network stack"
+       tristate

        default m
        help
          Bluetooth drivers and network stack
        default m
        help
          Bluetooth drivers and network stack

-         

 
 config BR2_PACKAGE_KMOD_LP
 
 config BR2_PACKAGE_KMOD_LP

-       tristate "kmod-lp........................ Parallel port and lp support"
+       prompt "kmod-lp........................... Parallel port and lp support"
+       tristate

        default m
        help
          Kernel modules for line printer and parallel port support
        default m
        help
          Kernel modules for line printer and parallel port support

-         
+
+config BR2_PACKAGE_KMOD_SOFTDOG
+       prompt "kmod-softdog..................... software watchdog"
+       tristate
+       default m
+       help
+         Kernel modules for software watchdog driver

 
 config BR2_PACKAGE_KMOD_WD1100
 
 config BR2_PACKAGE_KMOD_WD1100

-       tristate "kmod-wd1100.................... 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
        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"
 
 source "target/linux/package/Config.in"