move firstboot to preinit for now (until a better solution is implemented), required...

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

diff --git a/openwrt/target/linux/Config.in b/openwrt/target/linux/Config.in
index 9f3b525..9ccb11b 100644 (file)
--- a/openwrt/target/linux/Config.in
+++ b/openwrt/target/linux/Config.in
@@ -51,7 +51,7 @@ config BR2_LINUX_2_6_X86
 config BR2_LINUX_2_4_AR531X
        bool "Support for Atheros ar531x based APs"
        default n
-       depends BR2_mipseb
+       depends BR2_mips
        help
          Build firmware images for Atheros ar531x based boards
          (e.g. Netgear WGT624, Linksys WRT55AG)
@@ -70,7 +70,7 @@ comment "Device specific modules"
 config BR2_PACKAGE_KMOD_BRCM_ET
        prompt "kmod-brcm-et...................... Broadcom Ethernet Driver"
        tristate
-       depends BR2_LINUX_2_4_BRCM || BR2_LINUX_2_6_BRCM
+       depends BR2_LINUX_2_4_BRCM
        default m
        help
          Proprietary driver for Broadcom Ethernet chipsets (obsolete)
@@ -177,6 +177,13 @@ config BR2_PACKAGE_KMOD_PPPOE
        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
@@ -554,10 +561,11 @@ config BR2_PACKAGE_KMOD_NET_E100
 config BR2_PACKAGE_KMOD_NET_B44
        prompt "kmod-net-b44...................... Broadcom 44XX, 47XX ethernet driver"
        tristate
-       default y if BR2_LINUX_2_6_BRCM || BR2_LINUX_2_4_BRCM
+       depends !BR2_LINUX_2_6_BRCM
+       default y if BR2_LINUX_2_4_BRCM
        default m
        help
-         Free driver for Broadcom Ethernet chipsets (without switch support)
+         Free driver for Broadcom Ethernet chipsets
 
 config BR2_PACKAGE_KMOD_NET_HERMES
        prompt "kmod-net-hermes................... Hermes chipset 802.11b support (Orinoco/Prism2/Symbol) kernel support"
@@ -773,6 +781,13 @@ config BR2_PACKAGE_KMOD_LP
        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