summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--release/src/linux/linux/.config24
-rw-r--r--release/src/linux/linux/.config.old154
-rw-r--r--release/src/linux/linux/include/linux/autoconf.h180
3 files changed, 268 insertions, 90 deletions
diff --git a/release/src/linux/linux/.config b/release/src/linux/linux/.config
index 6334c2f4..c038e011 100644
--- a/release/src/linux/linux/.config
+++ b/release/src/linux/linux/.config
@@ -1,5 +1,5 @@
#
-# Automatically generated make config: don't edit
+# Automatically generated by make menuconfig: don't edit
#
CONFIG_MIPS=y
CONFIG_MIPS32=y
@@ -152,10 +152,6 @@ CONFIG_MTD=y
CONFIG_MTD_PARTITIONS=y
# CONFIG_MTD_CONCAT is not set
# CONFIG_MTD_REDBOOT_PARTS is not set
-
-#
-# User Modules And Translation Layers
-#
CONFIG_MTD_CHAR=y
# CONFIG_MTD_BLOCK is not set
CONFIG_MTD_BLOCK_RO=y
@@ -211,10 +207,6 @@ CONFIG_MTD_SFLASH=y
# CONFIG_MTD_SLRAM is not set
# CONFIG_MTD_MTDRAM is not set
# CONFIG_MTD_BLKMTD is not set
-
-#
-# Disk-On-Chip Device Drivers
-#
# CONFIG_MTD_DOC1000 is not set
# CONFIG_MTD_DOC2000 is not set
# CONFIG_MTD_DOC2001 is not set
@@ -387,10 +379,6 @@ CONFIG_IP_NF_TOMATOCT=m
# CONFIG_KHTTPD is not set
# CONFIG_ATM is not set
CONFIG_VLAN_8021Q=y
-
-#
-#
-#
# CONFIG_IPX is not set
# CONFIG_ATALK is not set
@@ -653,14 +641,6 @@ CONFIG_UNIX98_PTY_COUNT=16
# Joysticks
#
# CONFIG_INPUT_GAMEPORT is not set
-
-#
-# Input core support is needed for gameports
-#
-
-#
-# Input core support is needed for joysticks
-#
# CONFIG_QIC02_TAPE is not set
#
@@ -814,7 +794,7 @@ CONFIG_NLS_DEFAULT="iso8859-1"
# CONFIG_NLS_ISO8859_8 is not set
# CONFIG_NLS_CODEPAGE_1250 is not set
# CONFIG_NLS_CODEPAGE_1251 is not set
-# CONFIG_NLS_ISO8859_1 is not set
+CONFIG_NLS_ISO8859_1=m
# CONFIG_NLS_ISO8859_2 is not set
# CONFIG_NLS_ISO8859_3 is not set
# CONFIG_NLS_ISO8859_4 is not set
diff --git a/release/src/linux/linux/.config.old b/release/src/linux/linux/.config.old
index c11cd50d..6334c2f4 100644
--- a/release/src/linux/linux/.config.old
+++ b/release/src/linux/linux/.config.old
@@ -282,7 +282,8 @@ CONFIG_IP_MULTICAST=y
# CONFIG_IP_ADVANCED_ROUTER is not set
# CONFIG_IP_PNP is not set
# CONFIG_NET_IPIP is not set
-# CONFIG_NET_IPGRE is not set
+CONFIG_NET_IPGRE=m
+CONFIG_NET_IPGRE_BROADCAST=y
CONFIG_IP_MROUTE=y
# CONFIG_IP_PIMSM_V1 is not set
# CONFIG_IP_PIMSM_V2 is not set
@@ -294,67 +295,94 @@ CONFIG_SYN_COOKIES=y
# IP: Netfilter Configuration
#
CONFIG_IP_NF_CONNTRACK=y
-CONFIG_IP_NF_FTP=y
+CONFIG_IP_NF_FTP=m
+CONFIG_IP_NF_CONNTRACK_MARK=y
+CONFIG_IP_NF_H323=m
CONFIG_IP_NF_TFTP=y
-CONFIG_IP_NF_H323=y
# CONFIG_IP_NF_IRC is not set
-CONFIG_IP_NF_RTSP=y
+# CONFIG_IP_NF_CUSEEME is not set
+# CONFIG_IP_NF_QUAKE3 is not set
+CONFIG_IP_NF_RTSP=m
# CONFIG_IP_NF_MMS is not set
-CONFIG_IP_NF_SIP=y
-CONFIG_IP_NF_CT_PROTO_GRE=y
-CONFIG_IP_NF_PPTP=y
-CONFIG_IP_NF_CT_PROTO_ESP=y
+CONFIG_IP_NF_CT_PROTO_GRE=m
+CONFIG_IP_NF_PPTP=m
+CONFIG_IP_NF_SIP=m
+# CONFIG_IP_NF_CT_PROTO_ESP is not set
# CONFIG_IP_NF_QUEUE is not set
CONFIG_IP_NF_IPTABLES=y
CONFIG_IP_NF_MATCH_LIMIT=y
+CONFIG_IP_NF_MATCH_IPP2P=m
+# CONFIG_IP_NF_MATCH_GEOIP is not set
+# CONFIG_IP_NF_MATCH_QUOTA is not set
+CONFIG_IP_NF_MATCH_IPRANGE=y
# CONFIG_IP_NF_POOL is not set
CONFIG_IP_NF_MATCH_MAC=y
# CONFIG_IP_NF_MATCH_PKTTYPE is not set
CONFIG_IP_NF_MATCH_MARK=y
-# CONFIG_IP_NF_MATCH_MULTIPORT is not set
-# CONFIG_IP_NF_MATCH_MPORT is not set
-CONFIG_IP_NF_MATCH_TOS=y
-CONFIG_IP_NF_MATCH_TIME=y
+CONFIG_IP_NF_MATCH_MULTIPORT=m
+CONFIG_IP_NF_MATCH_MPORT=y
+CONFIG_IP_NF_MATCH_TOS=m
+CONFIG_IP_NF_MATCH_RECENT=m
+# CONFIG_IP_NF_MATCH_ACCOUNT is not set
+CONFIG_IP_NF_MATCH_CONDITION=m
+CONFIG_IP_NF_MATCH_TIME=m
# CONFIG_IP_NF_MATCH_ECN is not set
-# CONFIG_IP_NF_MATCH_DSCP is not set
+CONFIG_IP_NF_MATCH_DSCP=m
# CONFIG_IP_NF_MATCH_AH_ESP is not set
-# CONFIG_IP_NF_MATCH_LENGTH is not set
+CONFIG_IP_NF_MATCH_LENGTH=m
+CONFIG_IP_NF_MATCH_U32=m
# CONFIG_IP_NF_MATCH_TTL is not set
CONFIG_IP_NF_MATCH_TCPMSS=y
# CONFIG_IP_NF_MATCH_HELPER is not set
CONFIG_IP_NF_MATCH_STATE=y
+CONFIG_IP_NF_MATCH_CONNLIMIT=y
+CONFIG_IP_NF_MATCH_CONNMARK=y
# CONFIG_IP_NF_MATCH_CONNTRACK is not set
# CONFIG_IP_NF_MATCH_UNCLEAN is not set
-CONFIG_IP_NF_MATCH_WEBSTR=y
+# CONFIG_IP_NF_MATCH_STRING is not set
+# CONFIG_IP_NF_MATCH_WEBSTR is not set
# CONFIG_IP_NF_MATCH_OWNER is not set
+CONFIG_IP_NF_MATCH_LAYER7=m
+# CONFIG_IP_NF_MATCH_LAYER7_DEBUG is not set
+CONFIG_IP_NF_MATCH_WEB=m
+CONFIG_IP_NF_TARGET_BCOUNT=y
+CONFIG_IP_NF_MATCH_BCOUNT=y
+# CONFIG_IP_NF_TARGET_MACSAVE is not set
+# CONFIG_IP_NF_MATCH_MACSAVE is not set
+# CONFIG_IP_NF_MATCH_EXP is not set
CONFIG_IP_NF_FILTER=y
CONFIG_IP_NF_TARGET_REJECT=y
# CONFIG_IP_NF_TARGET_MIRROR is not set
CONFIG_IP_NF_NAT=y
CONFIG_IP_NF_NAT_NEEDED=y
CONFIG_IP_NF_TARGET_MASQUERADE=y
-CONFIG_IP_NF_TARGET_REDIRECT=y
-CONFIG_IP_NF_AUTOFW=y
+CONFIG_IP_NF_TARGET_REDIRECT=m
+CONFIG_IP_NF_NAT_H323=m
+# CONFIG_IP_NF_AUTOFW is not set
CONFIG_IP_NF_TARGET_TRIGGER=y
-CONFIG_IP_NF_NAT_H323=y
-CONFIG_IP_NF_NAT_PPTP=y
-CONFIG_IP_NF_NAT_SIP=y
-CONFIG_IP_NF_NAT_PROTO_GRE=y
+CONFIG_IP_NF_NAT_PPTP=m
+CONFIG_IP_NF_NAT_SIP=m
+CONFIG_IP_NF_NAT_PROTO_GRE=m
# CONFIG_IP_NF_NAT_LOCAL is not set
# CONFIG_IP_NF_NAT_SNMP_BASIC is not set
-CONFIG_IP_NF_NAT_FTP=y
+CONFIG_IP_NF_NAT_RTSP=m
+CONFIG_IP_NF_NAT_FTP=m
CONFIG_IP_NF_NAT_TFTP=y
-CONFIG_IP_NF_NAT_RTSP=y
-CONFIG_IP_NF_NAT_PROTO_ESP=y
CONFIG_IP_NF_MANGLE=y
-CONFIG_IP_NF_TARGET_TOS=y
+CONFIG_IP_NF_TARGET_TOS=m
# CONFIG_IP_NF_TARGET_ECN is not set
-CONFIG_IP_NF_TARGET_DSCP=y
+CONFIG_IP_NF_TARGET_DSCP=m
CONFIG_IP_NF_TARGET_MARK=y
+CONFIG_IP_NF_TARGET_ROUTE=m
+CONFIG_IP_NF_TARGET_CLASSIFY=m
+CONFIG_IP_NF_TARGET_IMQ=m
CONFIG_IP_NF_TARGET_LOG=y
+CONFIG_IP_NF_TARGET_CONNMARK=y
+CONFIG_IP_NF_TARGET_TTL=m
# CONFIG_IP_NF_TARGET_ULOG is not set
CONFIG_IP_NF_TARGET_TCPMSS=y
# CONFIG_IP_NF_ARPTABLES is not set
+CONFIG_IP_NF_TOMATOCT=m
# CONFIG_IPV6 is not set
# CONFIG_KHTTPD is not set
# CONFIG_ATM is not set
@@ -405,27 +433,29 @@ CONFIG_BRIDGE=y
# QoS and/or fair queueing
#
CONFIG_NET_SCHED=y
-CONFIG_NET_SCH_CBQ=y
+# CONFIG_NET_SCH_CBQ is not set
CONFIG_NET_SCH_HTB=y
# CONFIG_NET_SCH_CSZ is not set
+CONFIG_NET_SCH_HFSC=m
CONFIG_NET_SCH_PRIO=y
# CONFIG_NET_SCH_RED is not set
CONFIG_NET_SCH_SFQ=y
+CONFIG_NET_SCH_ESFQ=m
# CONFIG_NET_SCH_TEQL is not set
-# CONFIG_NET_SCH_TBF is not set
+CONFIG_NET_SCH_TBF=m
# CONFIG_NET_SCH_GRED is not set
# CONFIG_NET_SCH_DSMARK is not set
-# CONFIG_NET_SCH_INGRESS is not set
+CONFIG_NET_SCH_INGRESS=y
CONFIG_NET_QOS=y
CONFIG_NET_ESTIMATOR=y
CONFIG_NET_CLS=y
# CONFIG_NET_CLS_TCINDEX is not set
# CONFIG_NET_CLS_ROUTE4 is not set
-# CONFIG_NET_CLS_FW is not set
+CONFIG_NET_CLS_FW=y
CONFIG_NET_CLS_U32=y
# CONFIG_NET_CLS_RSVP is not set
# CONFIG_NET_CLS_RSVP6 is not set
-# CONFIG_NET_CLS_POLICE is not set
+CONFIG_NET_CLS_POLICE=y
#
# Network testing
@@ -479,7 +509,7 @@ CONFIG_WL_AP="wlconfig_lx_router_ap"
CONFIG_WL_STA="wlconfig_lx_router_sta"
CONFIG_WL_APSTA="wlconfig_lx_router_apsta"
CONFIG_WL_DNGL="wlconfig_lx_router_dongle"
-CONFIG_WL_LINK="AP"
+CONFIG_WL_LINK="APSTA"
#
# ARCnet devices
@@ -488,7 +518,8 @@ CONFIG_WL_LINK="AP"
# CONFIG_DUMMY is not set
# CONFIG_BONDING is not set
# CONFIG_EQUALIZER is not set
-# CONFIG_TUN is not set
+CONFIG_IMQ=m
+CONFIG_TUN=m
# CONFIG_ETHERTAP is not set
#
@@ -675,9 +706,11 @@ CONFIG_UNIX98_PTY_COUNT=16
# CONFIG_VFAT_FS is not set
# CONFIG_EFS_FS is not set
# CONFIG_JFFS_FS is not set
-# CONFIG_JFFS2_FS is not set
-CONFIG_CRAMFS=y
+CONFIG_JFFS2_FS=m
+CONFIG_JFFS2_FS_DEBUG=0
+# CONFIG_CRAMFS is not set
CONFIG_SQUASHFS=y
+# CONFIG_SQUASHFS_EMBEDDED is not set
# CONFIG_TMPFS is not set
CONFIG_RAMFS=y
# CONFIG_ZLIB_FS_INFLATE is not set
@@ -721,6 +754,9 @@ CONFIG_DEVFS_MOUNT=y
# CONFIG_NFSD_TCP is not set
# CONFIG_SUNRPC is not set
# CONFIG_LOCKD is not set
+CONFIG_CIFS=m
+# CONFIG_CIFS_STATS is not set
+# CONFIG_CIFS_POSIX is not set
# CONFIG_SMB_FS is not set
# CONFIG_NCP_FS is not set
# CONFIG_NCPFS_PACKET_SIGNING is not set
@@ -749,7 +785,49 @@ CONFIG_PARTITION_ADVANCED=y
# CONFIG_SUN_PARTITION is not set
# CONFIG_EFI_PARTITION is not set
# CONFIG_SMB_NLS is not set
-# CONFIG_NLS is not set
+CONFIG_NLS=y
+
+#
+# Native Language Support
+#
+CONFIG_NLS_DEFAULT="iso8859-1"
+# CONFIG_NLS_CODEPAGE_437 is not set
+# CONFIG_NLS_CODEPAGE_737 is not set
+# CONFIG_NLS_CODEPAGE_775 is not set
+# CONFIG_NLS_CODEPAGE_850 is not set
+# CONFIG_NLS_CODEPAGE_852 is not set
+# CONFIG_NLS_CODEPAGE_855 is not set
+# CONFIG_NLS_CODEPAGE_857 is not set
+# CONFIG_NLS_CODEPAGE_860 is not set
+# CONFIG_NLS_CODEPAGE_861 is not set
+# CONFIG_NLS_CODEPAGE_862 is not set
+# CONFIG_NLS_CODEPAGE_863 is not set
+# CONFIG_NLS_CODEPAGE_864 is not set
+# CONFIG_NLS_CODEPAGE_865 is not set
+# CONFIG_NLS_CODEPAGE_866 is not set
+# CONFIG_NLS_CODEPAGE_869 is not set
+# CONFIG_NLS_CODEPAGE_936 is not set
+# CONFIG_NLS_CODEPAGE_950 is not set
+# CONFIG_NLS_CODEPAGE_932 is not set
+# CONFIG_NLS_CODEPAGE_949 is not set
+# CONFIG_NLS_CODEPAGE_874 is not set
+# CONFIG_NLS_ISO8859_8 is not set
+# CONFIG_NLS_CODEPAGE_1250 is not set
+# CONFIG_NLS_CODEPAGE_1251 is not set
+# CONFIG_NLS_ISO8859_1 is not set
+# CONFIG_NLS_ISO8859_2 is not set
+# CONFIG_NLS_ISO8859_3 is not set
+# CONFIG_NLS_ISO8859_4 is not set
+# CONFIG_NLS_ISO8859_5 is not set
+# CONFIG_NLS_ISO8859_6 is not set
+# CONFIG_NLS_ISO8859_7 is not set
+# CONFIG_NLS_ISO8859_9 is not set
+# CONFIG_NLS_ISO8859_13 is not set
+# CONFIG_NLS_ISO8859_14 is not set
+# CONFIG_NLS_ISO8859_15 is not set
+# CONFIG_NLS_KOI8_R is not set
+# CONFIG_NLS_KOI8_U is not set
+# CONFIG_NLS_UTF8 is not set
#
# Multimedia devices
@@ -791,5 +869,5 @@ CONFIG_MAGIC_SYSRQ=y
#
# Library routines
#
-CONFIG_ZLIB_INFLATE=y
-# CONFIG_ZLIB_DEFLATE is not set
+CONFIG_ZLIB_INFLATE=m
+CONFIG_ZLIB_DEFLATE=m
diff --git a/release/src/linux/linux/include/linux/autoconf.h b/release/src/linux/linux/include/linux/autoconf.h
index e904da20..99c0ebe3 100644
--- a/release/src/linux/linux/include/linux/autoconf.h
+++ b/release/src/linux/linux/include/linux/autoconf.h
@@ -276,6 +276,8 @@
#undef CONFIG_IP_PNP
#undef CONFIG_NET_IPIP
#undef CONFIG_NET_IPGRE
+#define CONFIG_NET_IPGRE_MODULE 1
+#define CONFIG_NET_IPGRE_BROADCAST 1
#define CONFIG_IP_MROUTE 1
#undef CONFIG_IP_PIMSM_V1
#undef CONFIG_IP_PIMSM_V2
@@ -287,67 +289,125 @@
* IP: Netfilter Configuration
*/
#define CONFIG_IP_NF_CONNTRACK 1
-#define CONFIG_IP_NF_FTP 1
+#undef CONFIG_IP_NF_FTP
+#define CONFIG_IP_NF_FTP_MODULE 1
+#define CONFIG_IP_NF_CONNTRACK_MARK 1
+#undef CONFIG_IP_NF_H323
+#define CONFIG_IP_NF_H323_MODULE 1
#define CONFIG_IP_NF_TFTP 1
-#define CONFIG_IP_NF_H323 1
#undef CONFIG_IP_NF_IRC
-#define CONFIG_IP_NF_RTSP 1
+#undef CONFIG_IP_NF_CUSEEME
+#undef CONFIG_IP_NF_QUAKE3
+#undef CONFIG_IP_NF_RTSP
+#define CONFIG_IP_NF_RTSP_MODULE 1
#undef CONFIG_IP_NF_MMS
-#define CONFIG_IP_NF_SIP 1
-#define CONFIG_IP_NF_CT_PROTO_GRE 1
-#define CONFIG_IP_NF_PPTP 1
-#define CONFIG_IP_NF_CT_PROTO_ESP 1
+#undef CONFIG_IP_NF_CT_PROTO_GRE
+#define CONFIG_IP_NF_CT_PROTO_GRE_MODULE 1
+#undef CONFIG_IP_NF_PPTP
+#define CONFIG_IP_NF_PPTP_MODULE 1
+#undef CONFIG_IP_NF_SIP
+#define CONFIG_IP_NF_SIP_MODULE 1
+#undef CONFIG_IP_NF_CT_PROTO_ESP
#undef CONFIG_IP_NF_QUEUE
#define CONFIG_IP_NF_IPTABLES 1
#define CONFIG_IP_NF_MATCH_LIMIT 1
+#undef CONFIG_IP_NF_MATCH_IPP2P
+#define CONFIG_IP_NF_MATCH_IPP2P_MODULE 1
+#undef CONFIG_IP_NF_MATCH_GEOIP
+#undef CONFIG_IP_NF_MATCH_QUOTA
+#define CONFIG_IP_NF_MATCH_IPRANGE 1
#undef CONFIG_IP_NF_POOL
#define CONFIG_IP_NF_MATCH_MAC 1
#undef CONFIG_IP_NF_MATCH_PKTTYPE
#define CONFIG_IP_NF_MATCH_MARK 1
#undef CONFIG_IP_NF_MATCH_MULTIPORT
-#undef CONFIG_IP_NF_MATCH_MPORT
-#define CONFIG_IP_NF_MATCH_TOS 1
-#define CONFIG_IP_NF_MATCH_TIME 1
+#define CONFIG_IP_NF_MATCH_MULTIPORT_MODULE 1
+#define CONFIG_IP_NF_MATCH_MPORT 1
+#undef CONFIG_IP_NF_MATCH_TOS
+#define CONFIG_IP_NF_MATCH_TOS_MODULE 1
+#undef CONFIG_IP_NF_MATCH_RECENT
+#define CONFIG_IP_NF_MATCH_RECENT_MODULE 1
+#undef CONFIG_IP_NF_MATCH_ACCOUNT
+#undef CONFIG_IP_NF_MATCH_CONDITION
+#define CONFIG_IP_NF_MATCH_CONDITION_MODULE 1
+#undef CONFIG_IP_NF_MATCH_TIME
+#define CONFIG_IP_NF_MATCH_TIME_MODULE 1
#undef CONFIG_IP_NF_MATCH_ECN
#undef CONFIG_IP_NF_MATCH_DSCP
+#define CONFIG_IP_NF_MATCH_DSCP_MODULE 1
#undef CONFIG_IP_NF_MATCH_AH_ESP
#undef CONFIG_IP_NF_MATCH_LENGTH
+#define CONFIG_IP_NF_MATCH_LENGTH_MODULE 1
+#undef CONFIG_IP_NF_MATCH_U32
+#define CONFIG_IP_NF_MATCH_U32_MODULE 1
#undef CONFIG_IP_NF_MATCH_TTL
#define CONFIG_IP_NF_MATCH_TCPMSS 1
#undef CONFIG_IP_NF_MATCH_HELPER
#define CONFIG_IP_NF_MATCH_STATE 1
+#define CONFIG_IP_NF_MATCH_CONNLIMIT 1
+#define CONFIG_IP_NF_MATCH_CONNMARK 1
#undef CONFIG_IP_NF_MATCH_CONNTRACK
#undef CONFIG_IP_NF_MATCH_UNCLEAN
-#define CONFIG_IP_NF_MATCH_WEBSTR 1
+#undef CONFIG_IP_NF_MATCH_STRING
+#undef CONFIG_IP_NF_MATCH_WEBSTR
#undef CONFIG_IP_NF_MATCH_OWNER
+#undef CONFIG_IP_NF_MATCH_LAYER7
+#define CONFIG_IP_NF_MATCH_LAYER7_MODULE 1
+#undef CONFIG_IP_NF_MATCH_LAYER7_DEBUG
+#undef CONFIG_IP_NF_MATCH_WEB
+#define CONFIG_IP_NF_MATCH_WEB_MODULE 1
+#define CONFIG_IP_NF_TARGET_BCOUNT 1
+#define CONFIG_IP_NF_MATCH_BCOUNT 1
+#undef CONFIG_IP_NF_TARGET_MACSAVE
+#undef CONFIG_IP_NF_MATCH_MACSAVE
+#undef CONFIG_IP_NF_MATCH_EXP
#define CONFIG_IP_NF_FILTER 1
#define CONFIG_IP_NF_TARGET_REJECT 1
#undef CONFIG_IP_NF_TARGET_MIRROR
#define CONFIG_IP_NF_NAT 1
#define CONFIG_IP_NF_NAT_NEEDED 1
#define CONFIG_IP_NF_TARGET_MASQUERADE 1
-#define CONFIG_IP_NF_TARGET_REDIRECT 1
-#define CONFIG_IP_NF_AUTOFW 1
+#undef CONFIG_IP_NF_TARGET_REDIRECT
+#define CONFIG_IP_NF_TARGET_REDIRECT_MODULE 1
+#undef CONFIG_IP_NF_NAT_H323
+#define CONFIG_IP_NF_NAT_H323_MODULE 1
+#undef CONFIG_IP_NF_AUTOFW
#define CONFIG_IP_NF_TARGET_TRIGGER 1
-#define CONFIG_IP_NF_NAT_H323 1
-#define CONFIG_IP_NF_NAT_PPTP 1
-#define CONFIG_IP_NF_NAT_SIP 1
-#define CONFIG_IP_NF_NAT_PROTO_GRE 1
+#undef CONFIG_IP_NF_NAT_PPTP
+#define CONFIG_IP_NF_NAT_PPTP_MODULE 1
+#undef CONFIG_IP_NF_NAT_SIP
+#define CONFIG_IP_NF_NAT_SIP_MODULE 1
+#undef CONFIG_IP_NF_NAT_PROTO_GRE
+#define CONFIG_IP_NF_NAT_PROTO_GRE_MODULE 1
#undef CONFIG_IP_NF_NAT_LOCAL
#undef CONFIG_IP_NF_NAT_SNMP_BASIC
-#define CONFIG_IP_NF_NAT_FTP 1
+#undef CONFIG_IP_NF_NAT_RTSP
+#define CONFIG_IP_NF_NAT_RTSP_MODULE 1
+#undef CONFIG_IP_NF_NAT_FTP
+#define CONFIG_IP_NF_NAT_FTP_MODULE 1
#define CONFIG_IP_NF_NAT_TFTP 1
-#define CONFIG_IP_NF_NAT_RTSP 1
-#define CONFIG_IP_NF_NAT_PROTO_ESP 1
#define CONFIG_IP_NF_MANGLE 1
-#define CONFIG_IP_NF_TARGET_TOS 1
+#undef CONFIG_IP_NF_TARGET_TOS
+#define CONFIG_IP_NF_TARGET_TOS_MODULE 1
#undef CONFIG_IP_NF_TARGET_ECN
-#define CONFIG_IP_NF_TARGET_DSCP 1
+#undef CONFIG_IP_NF_TARGET_DSCP
+#define CONFIG_IP_NF_TARGET_DSCP_MODULE 1
#define CONFIG_IP_NF_TARGET_MARK 1
+#undef CONFIG_IP_NF_TARGET_ROUTE
+#define CONFIG_IP_NF_TARGET_ROUTE_MODULE 1
+#undef CONFIG_IP_NF_TARGET_CLASSIFY
+#define CONFIG_IP_NF_TARGET_CLASSIFY_MODULE 1
+#undef CONFIG_IP_NF_TARGET_IMQ
+#define CONFIG_IP_NF_TARGET_IMQ_MODULE 1
#define CONFIG_IP_NF_TARGET_LOG 1
+#define CONFIG_IP_NF_TARGET_CONNMARK 1
+#undef CONFIG_IP_NF_TARGET_TTL
+#define CONFIG_IP_NF_TARGET_TTL_MODULE 1
#undef CONFIG_IP_NF_TARGET_ULOG
#define CONFIG_IP_NF_TARGET_TCPMSS 1
#undef CONFIG_IP_NF_ARPTABLES
+#undef CONFIG_IP_NF_TOMATOCT
+#define CONFIG_IP_NF_TOMATOCT_MODULE 1
#undef CONFIG_IPV6
#undef CONFIG_KHTTPD
#undef CONFIG_ATM
@@ -394,27 +454,32 @@
* QoS and/or fair queueing
*/
#define CONFIG_NET_SCHED 1
-#define CONFIG_NET_SCH_CBQ 1
+#undef CONFIG_NET_SCH_CBQ
#define CONFIG_NET_SCH_HTB 1
#undef CONFIG_NET_SCH_CSZ
+#undef CONFIG_NET_SCH_HFSC
+#define CONFIG_NET_SCH_HFSC_MODULE 1
#define CONFIG_NET_SCH_PRIO 1
#undef CONFIG_NET_SCH_RED
#define CONFIG_NET_SCH_SFQ 1
+#undef CONFIG_NET_SCH_ESFQ
+#define CONFIG_NET_SCH_ESFQ_MODULE 1
#undef CONFIG_NET_SCH_TEQL
#undef CONFIG_NET_SCH_TBF
+#define CONFIG_NET_SCH_TBF_MODULE 1
#undef CONFIG_NET_SCH_GRED
#undef CONFIG_NET_SCH_DSMARK
-#undef CONFIG_NET_SCH_INGRESS
+#define CONFIG_NET_SCH_INGRESS 1
#define CONFIG_NET_QOS 1
#define CONFIG_NET_ESTIMATOR 1
#define CONFIG_NET_CLS 1
#undef CONFIG_NET_CLS_TCINDEX
#undef CONFIG_NET_CLS_ROUTE4
-#undef CONFIG_NET_CLS_FW
+#define CONFIG_NET_CLS_FW 1
#define CONFIG_NET_CLS_U32 1
#undef CONFIG_NET_CLS_RSVP
#undef CONFIG_NET_CLS_RSVP6
-#undef CONFIG_NET_CLS_POLICE
+#define CONFIG_NET_CLS_POLICE 1
/*
* Network testing
@@ -470,7 +535,7 @@
#define CONFIG_WL_STA "wlconfig_lx_router_sta"
#define CONFIG_WL_APSTA "wlconfig_lx_router_apsta"
#define CONFIG_WL_DNGL "wlconfig_lx_router_dongle"
-#define CONFIG_WL_LINK "AP"
+#define CONFIG_WL_LINK "APSTA"
/*
* ARCnet devices
@@ -479,7 +544,10 @@
#undef CONFIG_DUMMY
#undef CONFIG_BONDING
#undef CONFIG_EQUALIZER
+#undef CONFIG_IMQ
+#define CONFIG_IMQ_MODULE 1
#undef CONFIG_TUN
+#define CONFIG_TUN_MODULE 1
#undef CONFIG_ETHERTAP
/*
@@ -659,8 +727,11 @@
#undef CONFIG_EFS_FS
#undef CONFIG_JFFS_FS
#undef CONFIG_JFFS2_FS
-#define CONFIG_CRAMFS 1
+#define CONFIG_JFFS2_FS_MODULE 1
+#define CONFIG_JFFS2_FS_DEBUG (0)
+#undef CONFIG_CRAMFS
#define CONFIG_SQUASHFS 1
+#undef CONFIG_SQUASHFS_EMBEDDED
#undef CONFIG_TMPFS
#define CONFIG_RAMFS 1
#undef CONFIG_ZLIB_FS_INFLATE
@@ -704,6 +775,10 @@
#undef CONFIG_NFSD_TCP
#undef CONFIG_SUNRPC
#undef CONFIG_LOCKD
+#undef CONFIG_CIFS
+#define CONFIG_CIFS_MODULE 1
+#undef CONFIG_CIFS_STATS
+#undef CONFIG_CIFS_POSIX
#undef CONFIG_SMB_FS
#undef CONFIG_NCP_FS
#undef CONFIG_NCPFS_PACKET_SIGNING
@@ -732,7 +807,50 @@
#undef CONFIG_SUN_PARTITION
#undef CONFIG_EFI_PARTITION
#undef CONFIG_SMB_NLS
-#undef CONFIG_NLS
+#define CONFIG_NLS 1
+
+/*
+ * Native Language Support
+ */
+#define CONFIG_NLS_DEFAULT "iso8859-1"
+#undef CONFIG_NLS_CODEPAGE_437
+#undef CONFIG_NLS_CODEPAGE_737
+#undef CONFIG_NLS_CODEPAGE_775
+#undef CONFIG_NLS_CODEPAGE_850
+#undef CONFIG_NLS_CODEPAGE_852
+#undef CONFIG_NLS_CODEPAGE_855
+#undef CONFIG_NLS_CODEPAGE_857
+#undef CONFIG_NLS_CODEPAGE_860
+#undef CONFIG_NLS_CODEPAGE_861
+#undef CONFIG_NLS_CODEPAGE_862
+#undef CONFIG_NLS_CODEPAGE_863
+#undef CONFIG_NLS_CODEPAGE_864
+#undef CONFIG_NLS_CODEPAGE_865
+#undef CONFIG_NLS_CODEPAGE_866
+#undef CONFIG_NLS_CODEPAGE_869
+#undef CONFIG_NLS_CODEPAGE_936
+#undef CONFIG_NLS_CODEPAGE_950
+#undef CONFIG_NLS_CODEPAGE_932
+#undef CONFIG_NLS_CODEPAGE_949
+#undef CONFIG_NLS_CODEPAGE_874
+#undef CONFIG_NLS_ISO8859_8
+#undef CONFIG_NLS_CODEPAGE_1250
+#undef CONFIG_NLS_CODEPAGE_1251
+#undef CONFIG_NLS_ISO8859_1
+#define CONFIG_NLS_ISO8859_1_MODULE 1
+#undef CONFIG_NLS_ISO8859_2
+#undef CONFIG_NLS_ISO8859_3
+#undef CONFIG_NLS_ISO8859_4
+#undef CONFIG_NLS_ISO8859_5
+#undef CONFIG_NLS_ISO8859_6
+#undef CONFIG_NLS_ISO8859_7
+#undef CONFIG_NLS_ISO8859_9
+#undef CONFIG_NLS_ISO8859_13
+#undef CONFIG_NLS_ISO8859_14
+#undef CONFIG_NLS_ISO8859_15
+#undef CONFIG_NLS_KOI8_R
+#undef CONFIG_NLS_KOI8_U
+#undef CONFIG_NLS_UTF8
/*
* Multimedia devices
@@ -774,5 +892,7 @@
/*
* Library routines
*/
-#define CONFIG_ZLIB_INFLATE 1
+#undef CONFIG_ZLIB_INFLATE
+#define CONFIG_ZLIB_INFLATE_MODULE 1
#undef CONFIG_ZLIB_DEFLATE
+#define CONFIG_ZLIB_DEFLATE_MODULE 1