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

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

diff --git a/target/linux/ar7-2.4/config b/target/linux/ar7-2.4/config
index 47e57a9..adc39d5 100644 (file)
--- a/target/linux/ar7-2.4/config
+++ b/target/linux/ar7-2.4/config
@@ -339,10 +339,10 @@ CONFIG_NET_IPGRE=m
 #
 CONFIG_IP_NF_CONNTRACK=y
 CONFIG_IP_NF_CONNTRACK_MARK=y
-CONFIG_IP_NF_FTP=y
+CONFIG_IP_NF_FTP=m
 CONFIG_IP_NF_AMANDA=m
 CONFIG_IP_NF_TFTP=m
-CONFIG_IP_NF_IRC=y
+CONFIG_IP_NF_IRC=m
 CONFIG_IP_NF_CT_ACCT=m
 CONFIG_IP_NF_MATCH_CONNBYTES=m
 CONFIG_IP_NF_CT_PROTO_GRE=m
@@ -405,8 +405,8 @@ 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_FTP=y
+CONFIG_IP_NF_NAT_IRC=m
+CONFIG_IP_NF_NAT_FTP=m
 CONFIG_IP_NF_NAT_TFTP=m
 CONFIG_IP_NF_MANGLE=y
 CONFIG_IP_NF_TARGET_TOS=m
@@ -860,6 +860,7 @@ CONFIG_JOLIET=y
 # CONFIG_JFS_DEBUG is not set
 # CONFIG_JFS_STATISTICS is not set
 # CONFIG_MINIX_FS is not set
+CONFIG_MINI_FO=y
 # CONFIG_VXFS_FS is not set
 # CONFIG_NTFS_FS is not set
 # CONFIG_NTFS_RW is not set
@@ -1001,29 +1002,7 @@ CONFIG_NLS_DEFAULT="iso8859-1"
 #
 # Bluetooth support
 #
-CONFIG_BLUEZ=m
-CONFIG_BLUEZ_L2CAP=m
-CONFIG_BLUEZ_SCO=m
-CONFIG_BLUEZ_RFCOMM=m
-CONFIG_BLUEZ_RFCOMM_TTY=y
-CONFIG_BLUEZ_BNEP=m
-CONFIG_BLUEZ_BNEP_MC_FILTER=y
-CONFIG_BLUEZ_BNEP_PROTO_FILTER=y
-
-#
-# Bluetooth device drivers
-#
-# CONFIG_BLUEZ_HCIUSB is not set
-CONFIG_BLUEZ_HCIUART=m
-CONFIG_BLUEZ_HCIUART_H4=y
-CONFIG_BLUEZ_HCIUART_BCSP=y
-CONFIG_BLUEZ_HCIUART_BCSP_TXCRC=y
-# CONFIG_BLUEZ_HCIBFUSB is not set
-# CONFIG_BLUEZ_HCIDTL1 is not set
-# CONFIG_BLUEZ_HCIBT3C is not set
-# CONFIG_BLUEZ_HCIBLUECARD is not set
-# CONFIG_BLUEZ_HCIBTUART is not set
-# CONFIG_BLUEZ_HCIVHCI is not set
+# CONFIG_BLUEZ is not set
 
 #
 # Kernel hacking