move target/linux/package/switch to package/, fix a bug in the ipkg dependency handling

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

diff --git a/target/linux/brcm-2.4/config b/target/linux/brcm-2.4/config
index d40fc72..c4cf534 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
 #
 #
 # 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
 # CONFIG_MTD_PMC551 is not set
 # CONFIG_MTD_SLRAM is not set
 # CONFIG_MTD_MTDRAM is not set


@@ -321,7 +322,6 @@ CONFIG_NETLINK_DEV=m
 CONFIG_NETFILTER=y
 # CONFIG_NETFILTER_DEBUG is not set
 CONFIG_FILTER=y
 CONFIG_NETFILTER=y
 # CONFIG_NETFILTER_DEBUG is not set
 CONFIG_FILTER=y

-CONFIG_RING=m

 CONFIG_UNIX=y
 CONFIG_INET=y
 CONFIG_IP_MULTICAST=y
 CONFIG_UNIX=y
 CONFIG_INET=y
 CONFIG_IP_MULTICAST=y


@@ -354,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_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
 CONFIG_IP_NF_H323=m
 CONFIG_IP_NF_MMS=m
 CONFIG_IP_NF_RTSP=m


@@ -408,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_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
 CONFIG_IP_NF_NAT_H323=m
 CONFIG_IP_NF_NAT_MMS=m
 CONFIG_IP_NF_NAT_RTSP=m


@@ -813,7 +811,7 @@ CONFIG_B44=y
 # CONFIG_PLIP is not set
 CONFIG_PPP=m
 # CONFIG_PPP_MULTILINK is not set
 # 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
 CONFIG_PPP_ASYNC=m
 # CONFIG_PPP_SYNC_TTY is not set
 CONFIG_PPP_DEFLATE=m