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

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

diff --git a/target/linux/linux-2.4/config/x86 b/target/linux/linux-2.4/config/x86
index 6da4f94..339196f 100644 (file)
--- a/target/linux/linux-2.4/config/x86
+++ b/target/linux/linux-2.4/config/x86
@@ -276,7 +276,6 @@ CONFIG_NET_IPGRE=m
 #
 #   IP: Netfilter Configuration
 #
 #
 #   IP: Netfilter Configuration
 #

-CONFIG_IP_NF_MMS=m

 CONFIG_IP_NF_CONNTRACK=y
 CONFIG_IP_NF_CONNTRACK_MARK=y
 CONFIG_IP_NF_FTP=y
 CONFIG_IP_NF_CONNTRACK=y
 CONFIG_IP_NF_CONNTRACK_MARK=y
 CONFIG_IP_NF_FTP=y


@@ -289,6 +288,8 @@ 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_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_QUEUE=m
 CONFIG_IP_NF_IPTABLES=y
 CONFIG_IP_NF_MATCH_LIMIT=m
 CONFIG_IP_NF_QUEUE=m
 CONFIG_IP_NF_IPTABLES=y
 CONFIG_IP_NF_MATCH_LIMIT=m


@@ -309,6 +310,7 @@ CONFIG_IP_NF_MATCH_PKTTYPE=m
 CONFIG_IP_NF_MATCH_MARK=y
 CONFIG_IP_NF_MATCH_MULTIPORT=y
 CONFIG_IP_NF_MATCH_TOS=m
 CONFIG_IP_NF_MATCH_MARK=y
 CONFIG_IP_NF_MATCH_MULTIPORT=y
 CONFIG_IP_NF_MATCH_TOS=m

+CONFIG_IP_NF_MATCH_TIME=m

 CONFIG_IP_NF_MATCH_CONDITION=m
 CONFIG_IP_NF_MATCH_RECENT=m
 CONFIG_IP_NF_MATCH_ECN=m
 CONFIG_IP_NF_MATCH_CONDITION=m
 CONFIG_IP_NF_MATCH_RECENT=m
 CONFIG_IP_NF_MATCH_ECN=m


@@ -341,6 +343,7 @@ 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

+CONFIG_IP_NF_NAT_RTSP=m

 CONFIG_IP_NF_NAT_AMANDA=m
 CONFIG_IP_NF_NAT_SNMP_BASIC=m
 CONFIG_IP_NF_NAT_IRC=y
 CONFIG_IP_NF_NAT_AMANDA=m
 CONFIG_IP_NF_NAT_SNMP_BASIC=m
 CONFIG_IP_NF_NAT_IRC=y


@@ -940,7 +943,7 @@ CONFIG_WATCHDOG_NOWAYOUT=y
 # CONFIG_60XX_WDT is not set
 CONFIG_SC1200_WDT=m
 CONFIG_SCx200_WDT=m
 # CONFIG_60XX_WDT is not set
 CONFIG_SC1200_WDT=m
 CONFIG_SCx200_WDT=m

-CONFIG_SOFT_WATCHDOG=y
+CONFIG_SOFT_WATCHDOG=m

 # CONFIG_W83877F_WDT is not set
 # CONFIG_WDT is not set
 # CONFIG_WDTPCI is not set
 # CONFIG_W83877F_WDT is not set
 # CONFIG_WDT is not set
 # CONFIG_WDTPCI is not set


@@ -1331,7 +1334,7 @@ CONFIG_USB_SERIAL_BELKIN=m
 # CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set
 # CONFIG_USB_SERIAL_EMPEG is not set
 CONFIG_USB_SERIAL_FTDI_SIO=m
 # CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set
 # CONFIG_USB_SERIAL_EMPEG is not set
 CONFIG_USB_SERIAL_FTDI_SIO=m

-# CONFIG_USB_SERIAL_VISOR is not set
+CONFIG_USB_SERIAL_VISOR=m

 # CONFIG_USB_SERIAL_IPAQ is not set
 # CONFIG_USB_SERIAL_IR is not set
 # CONFIG_USB_SERIAL_EDGEPORT is not set
 # CONFIG_USB_SERIAL_IPAQ is not set
 # CONFIG_USB_SERIAL_IR is not set
 # CONFIG_USB_SERIAL_EDGEPORT is not set