Merged ipt_time to 2.6 kernel and added ipt_time for all 2.4 archs, closes #185

[openwrt/svn-archive/archive.git] / openwrt / target / linux / Config.in

diff --git a/openwrt/target/linux/Config.in b/openwrt/target/linux/Config.in
index cd2c5017ac3e1132fde9385c0a00f94284f65dc9..e56b2c82bdd6421f3370e9c750e31f20b882c11b 100644 (file)
--- a/openwrt/target/linux/Config.in
+++ b/openwrt/target/linux/Config.in
@@ -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)
@@ -126,6 +126,7 @@ config BR2_PACKAGE_KMOD_ATM
        prompt "kmod-atm.......................... ATM support"
        tristate
        default y if BR2_LINUX_2_4_AR7
+       default m if BR2_LINUX_2_6_BRCM
        help
          ATM support
 
@@ -163,6 +164,7 @@ 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 if BR2_LINUX_2_6_BRCM
        default m
        depends BR2_PACKAGE_KMOD_PPP
        select BR2_PACKAGE_KMOD_ATM
@@ -561,10 +563,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"
@@ -749,12 +752,24 @@ config BR2_PACKAGE_KMOD_USB_SERIAL_PL2303
        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_ATM
+        prompt "kmod-usb-atm...................... Support for USB ATM devices"
+       tristate
+       default m
+       depends BR2_PACKAGE_KMOD_USB_CONTROLLER
+
 comment "Misc. devices support"
 
 config BR2_PACKAGE_KMOD_AX25