X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/1a73c7e2c98f05b830dd6634b044ea42fd81cdf5..e2e1aff44f063dd354505f06e8e7f92dd966e194:/target/linux/Config.in

diff --git a/target/linux/Config.in b/target/linux/Config.in
index 9f3b52594..e56b2c82b 100644
--- a/target/linux/Config.in
+++ b/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)
@@ -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
@@ -177,6 +179,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 +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"
@@ -742,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
@@ -773,6 +795,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