integrate the newer broadcom wl driver from us robotics

[openwrt-10.03/.git] / target / linux / brcm-2.4 / config

diff --git a/target/linux/brcm-2.4/config b/target/linux/brcm-2.4/config
index b6120ebca5bc0f90b85afea3c9e74b4709f6eada..9759b90f5f8d2c1fd7469a698c95445bc81d3a89 100644 (file)
--- a/target/linux/brcm-2.4/config
+++ b/target/linux/brcm-2.4/config
@@ -246,6 +246,7 @@ CONFIG_MTD_BCM947XX=y
 #
 # Self-contained MTD device drivers
 #
+CONFIG_MTD_SFLASH=y
 # CONFIG_MTD_PMC551 is not set
 # CONFIG_MTD_SLRAM is not set
 # CONFIG_MTD_MTDRAM is not set
@@ -353,7 +354,6 @@ CONFIG_IP_NF_CT_ACCT=m
 CONFIG_IP_NF_MATCH_CONNBYTES=m
 CONFIG_IP_NF_CT_PROTO_GRE=m
 CONFIG_IP_NF_PPTP=m
-CONFIG_IP_NF_SIP=m
 CONFIG_IP_NF_H323=m
 CONFIG_IP_NF_MMS=m
 CONFIG_IP_NF_RTSP=m
@@ -407,7 +407,6 @@ CONFIG_IP_NF_TARGET_REDIRECT=m
 CONFIG_IP_NF_TARGET_NETMAP=m
 CONFIG_IP_NF_NAT_PPTP=m
 CONFIG_IP_NF_NAT_PROTO_GRE=m
-CONFIG_IP_NF_NAT_SIP=m
 CONFIG_IP_NF_NAT_H323=m
 CONFIG_IP_NF_NAT_MMS=m
 CONFIG_IP_NF_NAT_RTSP=m
@@ -812,7 +811,7 @@ CONFIG_B44=y
 # CONFIG_PLIP is not set
 CONFIG_PPP=m
 # CONFIG_PPP_MULTILINK is not set
-# CONFIG_PPP_FILTER is not set
+CONFIG_PPP_FILTER=y
 CONFIG_PPP_ASYNC=m
 # CONFIG_PPP_SYNC_TTY is not set
 CONFIG_PPP_DEFLATE=m
@@ -834,6 +833,7 @@ CONFIG_NET_RADIO=y
 # CONFIG_AIRO is not set
 # CONFIG_HERMES is not set
 CONFIG_WL=m
+CONFIG_WL2=m
 # CONFIG_PLX_HERMES is not set
 # CONFIG_TMD_HERMES is not set
 # CONFIG_PCI_HERMES is not set