[storm] don't override CONFIG_CRYPTO

[openwrt/svn-archive/archive.git] / target / linux / storm / config-default

diff --git a/target/linux/storm/config-default b/target/linux/storm/config-default
index 70f3dea1a703db7c065833d282f45533bf947845..074f518605bf2f29cdc662c1429e1e2dcffc8ba7 100644 (file)
--- a/target/linux/storm/config-default
+++ b/target/linux/storm/config-default
@@ -49,8 +49,6 @@ CONFIG_BITREVERSE=y
 # CONFIG_BLK_DEV_INITRD is not set
 # CONFIG_BONDING is not set
 CONFIG_BOUNCE=y
-CONFIG_BRIDGE=m
-CONFIG_BRIDGE_NETFILTER=y
 # CONFIG_BRIDGE_NF_EBTABLES is not set
 # CONFIG_BSD_PROCESS_ACCT is not set
 # CONFIG_BT is not set
@@ -74,7 +72,6 @@ CONFIG_CPU_FA_BTB=y
 # CONFIG_CPU_ICACHE_DISABLE is not set
 CONFIG_CPU_TLB_FA=y
 # CONFIG_CRC_ITU_T is not set
-# CONFIG_CRYPTO is not set
 CONFIG_DEBUG_BUGVERBOSE=y
 # CONFIG_DEBUG_DEVRES is not set
 # CONFIG_DEBUG_DRIVER is not set
@@ -138,7 +135,6 @@ CONFIG_HW_RANDOM=y
 # CONFIG_INET_ESP is not set
 # CONFIG_INET_IPCOMP is not set
 # CONFIG_INET_TUNNEL is not set
-CONFIG_INET_XFRM_MODE_BEET=m
 # CONFIG_INET_XFRM_MODE_TRANSPORT is not set
 # CONFIG_INET_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET_XFRM_TUNNEL is not set
@@ -146,29 +142,6 @@ CONFIG_INET_XFRM_MODE_BEET=m
 # CONFIG_IPSEC_NAT_TRAVERSAL is not set
 # CONFIG_IPV6 is not set
 CONFIG_IP_MROUTE=y
-# CONFIG_IP_NF_ARPTABLES is not set
-CONFIG_IP_NF_FILTER=m
-CONFIG_IP_NF_IPTABLES=m
-CONFIG_IP_NF_MANGLE=m
-# CONFIG_IP_NF_MATCH_AH is not set
-# CONFIG_IP_NF_MATCH_ECN is not set
-# CONFIG_IP_NF_MATCH_IPP2P is not set
-# CONFIG_IP_NF_MATCH_OWNER is not set
-# CONFIG_IP_NF_MATCH_RECENT is not set
-# CONFIG_IP_NF_MATCH_TIME is not set
-# CONFIG_IP_NF_MATCH_TOS is not set
-# CONFIG_IP_NF_MATCH_TTL is not set
-# CONFIG_IP_NF_QUEUE is not set
-# CONFIG_IP_NF_RAW is not set
-# CONFIG_IP_NF_SET is not set
-# CONFIG_IP_NF_TARGET_ECN is not set
-# CONFIG_IP_NF_TARGET_IMQ is not set
-# CONFIG_IP_NF_TARGET_LOG is not set
-# CONFIG_IP_NF_TARGET_REJECT is not set
-# CONFIG_IP_NF_TARGET_ROUTE is not set
-# CONFIG_IP_NF_TARGET_TOS is not set
-# CONFIG_IP_NF_TARGET_TTL is not set
-# CONFIG_IP_NF_TARGET_ULOG is not set
 CONFIG_IP_PIMSM_V1=y
 CONFIG_IP_PIMSM_V2=y
 # CONFIG_ISDN is not set
@@ -178,7 +151,6 @@ CONFIG_IP_PIMSM_V2=y
 CONFIG_KALLSYMS=y
 # CONFIG_KALLSYMS_ALL is not set
 CONFIG_KMOD=y
-CONFIG_LLC=m
 # CONFIG_LLC2 is not set
 # CONFIG_LOCK_STAT is not set
 # CONFIG_MINIX_FS is not set
@@ -234,38 +206,12 @@ CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
 CONFIG_MTD_REDBOOT_PARTS=y
 # CONFIG_MTD_REDBOOT_PARTS_READONLY is not set
 # CONFIG_MTD_ROM is not set
-# CONFIG_MTD_ROOTFS_ROOT_DEV is not set
-# CONFIG_MTD_ROOTFS_SPLIT is not set
 # CONFIG_MTD_SERIAL is not set
 CONFIG_MTD_SL2312_CFI=y
 # CONFIG_MTD_SL2312_SERIAL_ATMEL is not set
 # CONFIG_MTD_SL2312_SERIAL_ST is not set
 # CONFIG_MTD_SLRAM is not set
 CONFIG_NETDEV_1000=y
-CONFIG_NETFILTER_XTABLES=m
-# CONFIG_NETFILTER_XT_MATCH_DSCP is not set
-# CONFIG_NETFILTER_XT_MATCH_ESP is not set
-# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set
-# CONFIG_NETFILTER_XT_MATCH_LENGTH is not set
-# CONFIG_NETFILTER_XT_MATCH_LIMIT is not set
-# CONFIG_NETFILTER_XT_MATCH_MAC is not set
-# CONFIG_NETFILTER_XT_MATCH_MARK is not set
-# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set
-# CONFIG_NETFILTER_XT_MATCH_PHYSDEV is not set
-# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set
-# CONFIG_NETFILTER_XT_MATCH_POLICY is not set
-# CONFIG_NETFILTER_XT_MATCH_PORTSCAN is not set
-# CONFIG_NETFILTER_XT_MATCH_STRING is not set
-# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set
-# CONFIG_NETFILTER_XT_MATCH_U32 is not set
-# CONFIG_NETFILTER_XT_TARGET_CHAOS is not set
-# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set
-# CONFIG_NETFILTER_XT_TARGET_DELUDE is not set
-# CONFIG_NETFILTER_XT_TARGET_DSCP is not set
-# CONFIG_NETFILTER_XT_TARGET_MARK is not set
-# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set
-# CONFIG_NETFILTER_XT_TARGET_TARPIT is not set
-# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set
 # CONFIG_NET_ACT_GACT is not set
 # CONFIG_NET_ACT_IPT is not set
 # CONFIG_NET_ACT_MIRRED is not set
@@ -297,8 +243,7 @@ CONFIG_NET_SL351X=y
 # CONFIG_NEW_LEDS is not set
 # CONFIG_NFSD is not set
 # CONFIG_NFS_FS is not set
-# CONFIG_NF_CONNTRACK is not set
-# CONFIG_NF_CONNTRACK_ENABLED is not set
+CONFIG_NF_CONNTRACK=y
 # CONFIG_NLS is not set
 # CONFIG_NO_IDLE_HZ is not set
 # CONFIG_NO_IOPORT is not set
@@ -312,7 +257,6 @@ CONFIG_PCI=y
 CONFIG_PCI_SYSCALL=y
 # CONFIG_PPP_MPPE is not set
 # CONFIG_PPP_SYNC_TTY is not set
-CONFIG_PRINTK_TIME=y
 # CONFIG_PROVE_LOCKING is not set
 # CONFIG_RCU_TORTURE_TEST is not set
 CONFIG_RTC_LIB=y