netfilter: move iptable_raw, xt_NOTRACK from conntrack-extra to conntrack

[openwrt.git] / target / linux / ixp4xx / config-2.6.27

diff --git a/target/linux/ixp4xx/config-2.6.27 b/target/linux/ixp4xx/config-2.6.27
index f99f6d9..2064fb8 100644 (file)
--- a/target/linux/ixp4xx/config-2.6.27
+++ b/target/linux/ixp4xx/config-2.6.27
@@ -35,7 +35,6 @@ CONFIG_BOUNCE=y
 # CONFIG_CIFS_STATS is not set
 CONFIG_CLASSIC_RCU=y
 CONFIG_CMDLINE="root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"
-# CONFIG_CONFIGFS_FS is not set
 CONFIG_CPU_32=y
 CONFIG_CPU_32v5=y
 CONFIG_CPU_ABRT_EV5T=y
@@ -51,9 +50,6 @@ CONFIG_CPU_XSCALE=y
 CONFIG_CRC16=y
 # CONFIG_DEBUG_BUGVERBOSE is not set
 # CONFIG_DEBUG_USER is not set
-CONFIG_DEFAULT_TCP_CONG="westwood"
-# CONFIG_DEFAULT_VEGAS is not set
-CONFIG_DEFAULT_WESTWOOD=y
 CONFIG_DEVPORT=y
 # CONFIG_DM9000 is not set
 CONFIG_DMABOUNCE=y
@@ -148,7 +144,6 @@ CONFIG_MACH_USR8200=y
 CONFIG_MACH_WG302V1=y
 CONFIG_MACH_WG302V2=y
 CONFIG_MACH_WRT300NV2=y
-# CONFIG_MAC_PARTITION is not set
 # CONFIG_MEDIA_TUNER is not set
 # CONFIG_MEDIA_TUNER_MT20XX is not set
 # CONFIG_MEDIA_TUNER_SIMPLE is not set
@@ -203,13 +198,6 @@ CONFIG_SLABINFO=y
 CONFIG_SND_USB=y
 CONFIG_SPLIT_PTLOCK_CPUS=4096
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
-# CONFIG_TCP_CONG_HSTCP is not set
-# CONFIG_TCP_CONG_HYBLA is not set
-# CONFIG_TCP_CONG_LP is not set
-# CONFIG_TCP_CONG_SCALABLE is not set
-# CONFIG_TCP_CONG_VEGAS is not set
-# CONFIG_TCP_CONG_VENO is not set
-CONFIG_TCP_CONG_WESTWOOD=y
 CONFIG_TICK_ONESHOT=y
 CONFIG_TINY_SHMEM=y
 CONFIG_UID16=y