[storm] don't override CONFIG_BLK_DEV

[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 2ff7f47b39bae7a077a89bd8ba5b3b0ef98a3c4d..3e3524fe4841e385539b3d6fd7abdf9f5dd2d7f6 100644 (file)
--- a/target/linux/storm/config-default
+++ b/target/linux/storm/config-default
@@ -45,12 +45,9 @@ CONFIG_ARM=y
 CONFIG_BASE_SMALL=0
 # CONFIG_BINFMT_AOUT is not set
 CONFIG_BITREVERSE=y
-# CONFIG_BLK_DEV is not set
 # 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 +71,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 +134,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
@@ -155,7 +150,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
@@ -211,8 +205,6 @@ 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
@@ -250,6 +242,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=y
 # CONFIG_NLS is not set
 # CONFIG_NO_IDLE_HZ is not set
 # CONFIG_NO_IOPORT is not set
@@ -263,7 +256,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