projects / openwrt / staging / mkresin.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
move packages and kernel modules into menus
[openwrt/staging/mkresin.git] / openwrt / target / linux / Config.in
diff --git a/openwrt/target/linux/Config.in b/openwrt/target/linux/Config.in
index ba8e4113c3a5970a549b0b94c6c7e091e893deb7..1e68eaeb5b29c8226d441af9f01c49f04ac5f837 100644 (file)
--- a/openwrt/target/linux/Config.in
+++ b/openwrt/target/linux/Config.in
@@ -1,112 +1,40 @@
-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 "Target Root Filesystem"
 
 
-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)
+       config BR2_TARGET_ROOTFS_JFFS2
+               bool "jffs2"
+               default y
+               help
+                 Build a jffs2 root filesystem
 
 
-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_TARGET_ROOTFS_SQUASHFS_LZMA
+               bool "squashfs-lzma"
+               default y
+               help
+                 Build a squashfs-lzma root filesystem
 
 
-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)
+       config BR2_TARGET_ROOTFS_TGZ
+               bool "tgz"
+               default y
+               help
+                 Build a compressed tar archive of the the root filesystem
 
 
-config BR2_LINUX_2_6_X86
-       bool "Support for x86 boards [2.6]"
-       default n
-       depends BR2_i386
-       help
-         Build firmware images for x86 based boards
-         (e.g. Soekris net4521 and net4801, PC Engines WRAP...)
+endmenu
 
 
-endchoice
-       
-comment "Device specific modules"
+menu "Kernel Configuration / Device Support"
 
 
-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
+comment "Device specific configuration"
 
 
-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_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
-       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
-       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
-         ATM driver for the Sangam ADSL chip on AR7
-         Annex A version
+source "target/linux/*-2.[46]/Config.in"
 
 
-config BR2_PACKAGE_KMOD_SANGAM_ATM_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
-       help
-         ATM driver for the Sangam ADSL chip on AR7
-         Annex B version
+comment "Kernel modules"
 
 
-comment "Networking modules"
+menu "Networking modules"
 
 config BR2_PACKAGE_KMOD_ATM
        prompt "kmod-atm.......................... ATM support"
        tristate
        default y if BR2_LINUX_2_4_AR7
 
 config BR2_PACKAGE_KMOD_ATM
        prompt "kmod-atm.......................... ATM support"
        tristate
        default y if BR2_LINUX_2_4_AR7
+       default m
        help
          ATM support
 
        help
          ATM support
 
@@ -158,6 +86,13 @@ config BR2_PACKAGE_KMOD_PPPOE
        help
          Support for PPP over Ethernet
 
        help
          Support for PPP over Ethernet
 
+config BR2_PACKAGE_KMOD_RING
+       prompt "kmod-ring......................... PF Ring"
+       tristate
+       default m
+       help
+         PF Ring
+
 config BR2_PACKAGE_KMOD_SCHED
        prompt "kmod-sched........................ Traffic schedulers"
        tristate
 config BR2_PACKAGE_KMOD_SCHED
        prompt "kmod-sched........................ Traffic schedulers"
        tristate
@@ -172,7 +107,9 @@ config BR2_PACKAGE_KMOD_TUN
        help
          Kernel support for the TUN/TAP tunneling device
 
        help
          Kernel support for the TUN/TAP tunneling device
 
-comment "Filtering/Firewalling"
+endmenu
+
+menu "Filtering/Firewalling"
 
 config BR2_PACKAGE_KMOD_ARPTABLES
        prompt "kmod-arptables.................... ARP firewalling support"
 
 config BR2_PACKAGE_KMOD_ARPTABLES
        prompt "kmod-arptables.................... ARP firewalling support"
@@ -188,21 +125,141 @@ config BR2_PACKAGE_KMOD_EBTABLES
        help
          Kernel modules for bridge firewalling
 
        help
          Kernel modules for bridge firewalling
 
-config BR2_PACKAGE_KMOD_IPTABLES_V4
-       prompt "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
 
        tristate
        default y
        help
          Kernel modules for IPv4 firewalling
 
-config BR2_PACKAGE_KMOD_IPTABLES_V4_EXTRA
-       prompt "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
        tristate
        default m
        help
-         Extra kernel modules for IPv4 firewalling
+         Netfilter (IPv4) kernel modules for connection tracking
 
 
-config BR2_PACKAGE_KMOD_IPTABLES_V6
+         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
        prompt "kmod-ip6tables.................... Kernel modules for ip6tables"
        tristate
        default m
@@ -210,12 +267,15 @@ config BR2_PACKAGE_KMOD_IPTABLES_V6
        help
          IPv6 firewalling support
 
        help
          IPv6 firewalling support
 
-comment "Block devices support"
+endmenu
+
+menu "Block devices support"
 
 config BR2_PACKAGE_KMOD_IDE
        prompt "kmod-ide.......................... IDE support"
        tristate
        default m
 
 config BR2_PACKAGE_KMOD_IDE
        prompt "kmod-ide.......................... IDE support"
        tristate
        default m
+       depends BR2_LINUX_2_4_X86 || BR2_LINUX_2_6_X86 || BR2_LINUX_2_4_BRCM || BR2_LINUX_2_6_BRCM
        help
          Kernel modules for IDE support
          useful for usb mass storage devices (e.g. on WL-HDD)
        help
          Kernel modules for IDE support
          useful for usb mass storage devices (e.g. on WL-HDD)
@@ -234,19 +294,19 @@ config BR2_PACKAGE_KMOD_NBD
        help
          Kernel module for network block device
 
        help
          Kernel module for network block device
 
-comment "Cryptographic support"
+endmenu
 
 config BR2_PACKAGE_KMOD_CRYPTO
 
 config BR2_PACKAGE_KMOD_CRYPTO
-       prompt "kmod-crypto....................... CryptoAPI modules"
+       prompt "CryptoAPI modules"
        tristate
        default m
        select BUSYBOX_CONFIG_FEATURE_CHECK_TAINTED_MODULE
        help
          Kernel modules for cryptographic algorithms
 
        tristate
        default m
        select BUSYBOX_CONFIG_FEATURE_CHECK_TAINTED_MODULE
        help
          Kernel modules for cryptographic algorithms
 
-comment "Filesystems support"
+menu "Filesystems support"
 
 
-config BR2_PACKAGE_KMOD_CIFS
+config BR2_PACKAGE_KMOD_FS_CIFS
        prompt "kmod-fs-cifs...................... CIFS support"
        tristate
        default m
        prompt "kmod-fs-cifs...................... CIFS support"
        tristate
        default m
@@ -297,11 +357,14 @@ config BR2_PACKAGE_KMOD_FS_XFS
        help
          Kernel modules for XFS filesystem support
 
        help
          Kernel modules for XFS filesystem support
 
-comment "Multimedia devices support"
+endmenu
+
+menu "Multimedia devices support"
 
 config BR2_PACKAGE_KMOD_PWC
        prompt "kmod-pwc.......................... Kernel driver for USB Philips Cameras"
        tristate
 
 config BR2_PACKAGE_KMOD_PWC
        prompt "kmod-pwc.......................... Kernel driver for USB Philips Cameras"
        tristate
+       depends BR2_PACKAGE_KMOD_USB
        default m
 
 config BR2_PACKAGE_KMOD_SOUNDCORE
        default m
 
 config BR2_PACKAGE_KMOD_SOUNDCORE
@@ -317,7 +380,9 @@ config BR2_PACKAGE_KMOD_VIDEODEV
        tristate
        default m
 
        tristate
        default m
 
-comment "Native Language support"
+endmenu
+
+menu "Native Language support"
 
 config BR2_PACKAGE_KMOD_NLS_BASE
        prompt "kmod-nls-base..................... Native Language support"
 
 config BR2_PACKAGE_KMOD_NLS_BASE
        prompt "kmod-nls-base..................... Native Language support"
@@ -366,11 +431,15 @@ config BR2_PACKAGE_KMOD_NLS_UTF8
        help
          Kernel native language support
 
        help
          Kernel native language support
 
-comment "Network devices support"
+endmenu
+
+menu "Network devices support"
+       depends BR2_LINUX_2_4_X86 || BR2_LINUX_2_6_X86
 
 config BR2_PACKAGE_KMOD_NET_3C59X
 
 config BR2_PACKAGE_KMOD_NET_3C59X
-       prompt "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
        tristate
+       depends BR2_LINUX_2_4_X86 || BR2_LINUX_2_6_X86
        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 
@@ -385,6 +454,7 @@ config BR2_PACKAGE_KMOD_NET_3C59X
 config BR2_PACKAGE_KMOD_NET_8139TOO
        prompt "kmod-net-8139too.................. RealTek RTL-8139 PCI Fast Ethernet Adapter kernel support"
        tristate
 config BR2_PACKAGE_KMOD_NET_8139TOO
        prompt "kmod-net-8139too.................. RealTek RTL-8139 PCI Fast Ethernet Adapter kernel support"
        tristate
+       depends BR2_LINUX_2_4_X86 || BR2_LINUX_2_6_X86
        default m
        help
          This is a driver for the Fast Ethernet PCI network cards based on 
        default m
        help
          This is a driver for the Fast Ethernet PCI network cards based on 
@@ -393,6 +463,7 @@ config BR2_PACKAGE_KMOD_NET_8139TOO
 config BR2_PACKAGE_KMOD_NET_AIRO
        prompt "kmod-net-airo..................... Cisco/Aironet 34X/35X/4500/4800 ISA and PCI cards kernel support"
        tristate
 config BR2_PACKAGE_KMOD_NET_AIRO
        prompt "kmod-net-airo..................... Cisco/Aironet 34X/35X/4500/4800 ISA and PCI cards kernel support"
        tristate
+       depends BR2_LINUX_2_4_X86 || BR2_LINUX_2_6_X86
        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 
@@ -405,24 +476,18 @@ config BR2_PACKAGE_KMOD_NET_AIRO
          and Cisco proprietary API, so both the Linux Wireless Tools and the 
          Cisco Linux utilities can be used to configure the card.
 
          and Cisco proprietary API, so both the Linux Wireless Tools and the 
          Cisco Linux utilities can be used to configure the card.
 
-config BR2_PACKAGE_KMOD_E100
+config BR2_PACKAGE_KMOD_NET_E100
        prompt "kmod-net-e100..................... Intel(R) PRO/100+ cards kernel support"
        tristate
        prompt "kmod-net-e100..................... Intel(R) PRO/100+ cards kernel support"
        tristate
+       depends BR2_LINUX_2_4_X86 || BR2_LINUX_2_6_X86
        default m
        help
          Intel(R) PRO/100+ cards kernel support
 
        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
        prompt "kmod-net-hermes................... Hermes chipset 802.11b support (Orinoco/Prism2/Symbol) kernel support"
        tristate
 config BR2_PACKAGE_KMOD_NET_HERMES
        prompt "kmod-net-hermes................... Hermes chipset 802.11b support (Orinoco/Prism2/Symbol) kernel support"
        tristate
+       depends BR2_LINUX_2_4_X86 || BR2_LINUX_2_6_X86
        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 
@@ -463,6 +528,7 @@ config BR2_PACKAGE_KMOD_NET_HERMES_PLX
 config BR2_PACKAGE_KMOD_NET_NATSEMI
        prompt "kmod-net-natsemi.................. National Semiconductor DP8381x series PCI Ethernet kernel support"
        tristate
 config BR2_PACKAGE_KMOD_NET_NATSEMI
        prompt "kmod-net-natsemi.................. National Semiconductor DP8381x series PCI Ethernet kernel support"
        tristate
+       depends BR2_LINUX_2_4_X86 || BR2_LINUX_2_6_X86
        default m
        help
          This driver is for the National Semiconductor DP83810 series, 
        default m
        help
          This driver is for the National Semiconductor DP83810 series, 
@@ -472,6 +538,7 @@ config BR2_PACKAGE_KMOD_NET_NATSEMI
 config BR2_PACKAGE_KMOD_NET_PRISM54
        prompt "kmod-net-prism54.................. Intersil Prism GT/Duette/Indigo PCI/PCMCIA cards kernel support"
        tristate
 config BR2_PACKAGE_KMOD_NET_PRISM54
        prompt "kmod-net-prism54.................. Intersil Prism GT/Duette/Indigo PCI/PCMCIA cards kernel support"
        tristate
+       depends BR2_LINUX_2_4_X86 || BR2_LINUX_2_6_X86 || BR2_LINUX_2_4_BRCM || BR2_LINUX_2_6_BRCM
        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: 
@@ -507,18 +574,32 @@ config BR2_PACKAGE_KMOD_NET_PRISM54
          
          Note: You need a motherboard with DMA support to use any of these cards.
 
          
          Note: You need a motherboard with DMA support to use any of these cards.
 
-comment "PCMCIA/CardBus support"
+endmenu
+
+menu "PCMCIA/CardBus support"
+       depends BR2_LINUX_2_4_X86 || BR2_LINUX_2_6_X86 || BR2_LINUX_2_4_BRCM || BR2_LINUX_2_6_BRCM
 
 config BR2_PACKAGE_KMOD_PCMCIA_CORE
        prompt "kmod-pcmcia-core.................. PCMCIA/CardBus support"
 
 config BR2_PACKAGE_KMOD_PCMCIA_CORE
        prompt "kmod-pcmcia-core.................. PCMCIA/CardBus support"
+       depends BR2_LINUX_PCMCIA_SUPPORT
+       tristate
+       depends BR2_LINUX_2_4_X86 || BR2_LINUX_2_6_X86 || BR2_LINUX_2_4_BRCM || BR2_LINUX_2_6_BRCM
+       default m
+
+config BR2_PACKAGE_KMOD_PCMCIA_SERIAL
+       prompt   "kmod-pcmcia-serial.............. PCMCIA/CardBus serial device support"
        tristate
        default m
        tristate
        default m
+       depends BR2_PACKAGE_KMOD_PCMCIA_CORE
 
 
-comment "USB support"
+endmenu
+
+menu "USB support"
 
 config BR2_PACKAGE_KMOD_USB
        prompt "kmod-usb-core..................... USB support"
        tristate
 
 config BR2_PACKAGE_KMOD_USB
        prompt "kmod-usb-core..................... USB support"
        tristate
+       default n if BR2_LINUX_2_4_AR531X
        default m
 
 config BR2_PACKAGE_KMOD_USB_UHCI
        default m
 
 config BR2_PACKAGE_KMOD_USB_UHCI
@@ -596,13 +677,27 @@ config BR2_PACKAGE_KMOD_USB_SERIAL_PL2303
        default m
        depends BR2_PACKAGE_KMOD_USB_SERIAL
 
        default m
        depends BR2_PACKAGE_KMOD_USB_SERIAL
 
+config BR2_PACKAGE_KMOD_USB_SERIAL_VISOR
+       prompt   "kmod-usb-serial-visor.......... Support for Handspring Visor / Palm m50x / Sony Clie Driver"
+       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
 
 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_USB_ATM
+        prompt "kmod-usb-atm...................... Support for USB ATM devices"
+       tristate
+       default m
+       depends BR2_PACKAGE_KMOD_USB_CONTROLLER
+
+endmenu
+
+menu "Misc. devices support"
 
 config BR2_PACKAGE_KMOD_AX25
        prompt "kmod-ax25......................... AX25 support"
 
 config BR2_PACKAGE_KMOD_AX25
        prompt "kmod-ax25......................... AX25 support"
@@ -617,6 +712,7 @@ config BR2_PACKAGE_KMOD_BLUETOOTH
        prompt "kmod-bluetooth.................... Bluetooth drivers and network stack"
        tristate
        default m
        prompt "kmod-bluetooth.................... Bluetooth drivers and network stack"
        tristate
        default m
+       default n if BR2_LINUX_2_4_AR531X
        help
          Bluetooth drivers and network stack
 
        help
          Bluetooth drivers and network stack
 
@@ -627,6 +723,13 @@ config BR2_PACKAGE_KMOD_LP
        help
          Kernel modules for line printer and parallel port support
 
        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
        prompt "kmod-wd1100....................... Soekris net4801 watchdog"
        tristate
 config BR2_PACKAGE_KMOD_WD1100
        prompt "kmod-wd1100....................... Soekris net4801 watchdog"
        tristate
@@ -636,6 +739,12 @@ config BR2_PACKAGE_KMOD_WD1100
          Driver for the NatSemi SC1x00 series Watchdog 
          found on Soekris net4801 boards
 
          Driver for the NatSemi SC1x00 series Watchdog 
          found on Soekris net4801 boards
 
-comment "Additional kernel modules"
+endmenu
+
+menu "Additional kernel modules"
 
 source "target/linux/package/Config.in"
 
 source "target/linux/package/Config.in"
+
+endmenu
+
+endmenu
Staging tree of Mathias Kresin