reorganize nat helper packages, move ftp and irc nat to a package that is enabled...

[openwrt.git] / target / linux / brcm63xx-2.6 / config

diff --git a/target/linux/brcm63xx-2.6/config b/target/linux/brcm63xx-2.6/config
index ac286df..ec86fa3 100644 (file)
--- a/target/linux/brcm63xx-2.6/config
+++ b/target/linux/brcm63xx-2.6/config
@@ -381,8 +381,8 @@ CONFIG_IP_NF_CT_ACCT=y
 # CONFIG_IP_NF_CONNTRACK_MARK is not set
 # CONFIG_IP_NF_CONNTRACK_EVENTS is not set
 # CONFIG_IP_NF_CT_PROTO_SCTP is not set
 # CONFIG_IP_NF_CONNTRACK_MARK is not set
 # CONFIG_IP_NF_CONNTRACK_EVENTS is not set
 # CONFIG_IP_NF_CT_PROTO_SCTP is not set

-CONFIG_IP_NF_FTP=y
-CONFIG_IP_NF_IRC=y
+CONFIG_IP_NF_FTP=m
+CONFIG_IP_NF_IRC=m

 # CONFIG_IP_NF_NETBIOS_NS is not set
 CONFIG_IP_NF_TFTP=y
 CONFIG_IP_NF_AMANDA=m
 # CONFIG_IP_NF_NETBIOS_NS is not set
 CONFIG_IP_NF_TFTP=y
 CONFIG_IP_NF_AMANDA=m


@@ -419,8 +419,8 @@ CONFIG_IP_NF_TARGET_ROUTE=m
 # CONFIG_IP_NF_TARGET_NETMAP is not set
 # CONFIG_IP_NF_TARGET_SAME is not set
 # CONFIG_IP_NF_NAT_SNMP_BASIC is not set
 # CONFIG_IP_NF_TARGET_NETMAP is not set
 # CONFIG_IP_NF_TARGET_SAME is not set
 # CONFIG_IP_NF_NAT_SNMP_BASIC is not set

-CONFIG_IP_NF_NAT_IRC=y
-CONFIG_IP_NF_NAT_FTP=y
+CONFIG_IP_NF_NAT_IRC=m
+CONFIG_IP_NF_NAT_FTP=m

 CONFIG_IP_NF_NAT_TFTP=y
 CONFIG_IP_NF_NAT_AMANDA=m
 CONFIG_IP_NF_NAT_PPTP=m
 CONFIG_IP_NF_NAT_TFTP=y
 CONFIG_IP_NF_NAT_AMANDA=m
 CONFIG_IP_NF_NAT_PPTP=m


@@ -1401,6 +1401,7 @@ CONFIG_LEDS_TRIGGER_TIMER=y
 # CONFIG_FS_POSIX_ACL is not set
 # CONFIG_XFS_FS is not set
 # CONFIG_OCFS2_FS is not set
 # CONFIG_FS_POSIX_ACL is not set
 # CONFIG_XFS_FS is not set
 # CONFIG_OCFS2_FS is not set

+CONFIG_MINI_FO=y

 # CONFIG_MINIX_FS is not set
 # CONFIG_ROMFS_FS is not set
 CONFIG_INOTIFY=y
 # CONFIG_MINIX_FS is not set
 # CONFIG_ROMFS_FS is not set
 CONFIG_INOTIFY=y


@@ -1413,8 +1414,12 @@ CONFIG_DNOTIFY=y
 #
 # CD-ROM/DVD Filesystems
 #
 #
 # CD-ROM/DVD Filesystems
 #

-# CONFIG_ISO9660_FS is not set
-# CONFIG_UDF_FS is not set
+CONFIG_ISO9660_FS=m
+CONFIG_JOLIET=y
+CONFIG_ZISOFS=y
+CONFIG_ZISOFS_FS=m
+CONFIG_UDF_FS=m
+CONFIG_UDF_NLS=y

 
 #
 # DOS/FAT/NT Filesystems
 
 #
 # DOS/FAT/NT Filesystems


@@ -1540,7 +1545,7 @@ CONFIG_NLS_ISO8859_1=m
 # CONFIG_NLS_ISO8859_13 is not set
 # CONFIG_NLS_ISO8859_14 is not set
 CONFIG_NLS_ISO8859_15=m
 # CONFIG_NLS_ISO8859_13 is not set
 # CONFIG_NLS_ISO8859_14 is not set
 CONFIG_NLS_ISO8859_15=m

-# CONFIG_NLS_KOI8_R is not set
+CONFIG_NLS_KOI8_R=m

 # CONFIG_NLS_KOI8_U is not set
 CONFIG_NLS_UTF8=m
 
 # CONFIG_NLS_KOI8_U is not set
 CONFIG_NLS_UTF8=m