[kernel] generic-2.6/2.6.30: refresh patches

[openwrt.git] / target / linux / kirkwood / config-default

diff --git a/target/linux/kirkwood/config-default b/target/linux/kirkwood/config-default
index 7f2c89e..a108b05 100644 (file)
--- a/target/linux/kirkwood/config-default
+++ b/target/linux/kirkwood/config-default
@@ -20,8 +20,6 @@ CONFIG_BITREVERSE=y
 CONFIG_CACHE_FEROCEON_L2=y
 # CONFIG_CACHE_FEROCEON_L2_WRITETHROUGH is not set
 CONFIG_CMDLINE="root=/dev/mtdblock1 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"
-CONFIG_COMPAT_NET_DEV_OPS=y
-# CONFIG_CONFIGFS_FS is not set
 CONFIG_CPU_32=y
 CONFIG_CPU_32v5=y
 CONFIG_CPU_ABRT_EV5T=y
@@ -38,7 +36,6 @@ CONFIG_CRC16=y
 # CONFIG_DCB is not set
 # CONFIG_DEBUG_BUGVERBOSE is not set
 # CONFIG_DEBUG_USER is not set
-CONFIG_DEFAULT_TCP_CONG="westwood"
 CONFIG_DEVPORT=y
 # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
 CONFIG_DLCI=m
@@ -53,7 +50,6 @@ CONFIG_DNOTIFY=y
 # CONFIG_FPE_FASTFPE is not set
 # CONFIG_FPE_NWFPE is not set
 CONFIG_FRAME_POINTER=y
-# CONFIG_FREEZER is not set
 CONFIG_GENERIC_CLOCKEVENTS=y
 CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
 CONFIG_GENERIC_FIND_LAST_BIT=y
@@ -100,7 +96,6 @@ CONFIG_LEGACY_PTY_COUNT=256
 # CONFIG_MACH_RD88F6281 is not set
 CONFIG_MACH_SHEEVAPLUG=y
 # CONFIG_MACH_TS219 is not set
-# CONFIG_MAC_PARTITION is not set
 CONFIG_MISC_FILESYSTEMS=y
 CONFIG_MMC=m
 CONFIG_MMC_BLOCK=m
@@ -125,7 +120,6 @@ CONFIG_NET_DSA_TAG_DSA=y
 # CONFIG_NET_DSA_TAG_EDSA is not set
 # CONFIG_NET_DSA_TAG_TRAILER is not set
 # CONFIG_NET_SCH_DRR is not set
-# CONFIG_NF_DEFRAG_IPV4 is not set
 # CONFIG_NO_IOPORT is not set
 # CONFIG_NVRAM is not set
 CONFIG_OUTER_CACHE=y
@@ -137,7 +131,6 @@ CONFIG_PCI=y
 # CONFIG_PCI_STUB is not set
 CONFIG_PCI_SYSCALL=y
 CONFIG_PHYLIB=y
-# CONFIG_PHYS_ADDR_T_64BIT is not set
 CONFIG_PLAT_ORION=y
 CONFIG_RTC_CLASS=y
 CONFIG_RTC_DRV_ISL1208=y
@@ -147,12 +140,8 @@ CONFIG_SCSI=m
 # CONFIG_SCSI_MULTI_LUN is not set
 # CONFIG_SDIO_UART is not set
 # CONFIG_SERIAL_8250_EXTENDED is not set
-# CONFIG_SHMEM is not set
 CONFIG_SPLIT_PTLOCK_CPUS=4096
-# CONFIG_SWAP is not set
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
-CONFIG_TCP_CONG_VEGAS=m
-CONFIG_TCP_CONG_WESTWOOD=y
 CONFIG_TICK_ONESHOT=y
 CONFIG_UID16=y
 CONFIG_USB=m