Fix brcm63xx patch (humm diff laught at me)

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

diff --git a/target/linux/x86-2.4/config b/target/linux/x86-2.4/config
index d46dc3c..1adc295 100644 (file)
--- a/target/linux/x86-2.4/config
+++ b/target/linux/x86-2.4/config
@@ -286,7 +286,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


@@ -339,7 +338,6 @@ CONFIG_IP_NF_TARGET_MASQUERADE=y
 CONFIG_IP_NF_TARGET_REDIRECT=m
 CONFIG_IP_NF_TARGET_NETMAP=m
 CONFIG_IP_NF_NAT_PPTP=m
 CONFIG_IP_NF_TARGET_REDIRECT=m
 CONFIG_IP_NF_TARGET_NETMAP=m
 CONFIG_IP_NF_NAT_PPTP=m

-CONFIG_IP_NF_NAT_SIP=m

 CONFIG_IP_NF_NAT_H323=m
 CONFIG_IP_NF_NAT_PROTO_GRE=m
 CONFIG_IP_NF_NAT_MMS=m
 CONFIG_IP_NF_NAT_H323=m
 CONFIG_IP_NF_NAT_PROTO_GRE=m
 CONFIG_IP_NF_NAT_MMS=m


@@ -763,7 +761,7 @@ CONFIG_8139TOO=m
 # 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