update to 2.6.30-rc7

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

diff --git a/target/linux/kirkwood/config-default b/target/linux/kirkwood/config-default
index 35a8963..a108b05 100644 (file)
--- a/target/linux/kirkwood/config-default
+++ b/target/linux/kirkwood/config-default
@@ -1,52 +1,13 @@
 # CONFIG_AEABI is not set
 CONFIG_ALIGNMENT_TRAP=y
-# CONFIG_ARCH_AAEC2000 is not set
-# CONFIG_ARCH_AT91 is not set
-# CONFIG_ARCH_CLPS711X is not set
-# CONFIG_ARCH_DAVINCI is not set
-# CONFIG_ARCH_EBSA110 is not set
-# CONFIG_ARCH_EP93XX is not set
 CONFIG_ARCH_FLATMEM_HAS_HOLES=y
-# CONFIG_ARCH_FOOTBRIDGE is not set
-# CONFIG_ARCH_GEMINI is not set
-# CONFIG_ARCH_H720X is not set
 # CONFIG_ARCH_HAS_ILOG2_U32 is not set
 # CONFIG_ARCH_HAS_ILOG2_U64 is not set
-# CONFIG_ARCH_IMX is not set
-# CONFIG_ARCH_INTEGRATOR is not set
-# CONFIG_ARCH_IOP13XX is not set
-# CONFIG_ARCH_IOP32X is not set
-# CONFIG_ARCH_IOP33X is not set
-# CONFIG_ARCH_IXP2000 is not set
-# CONFIG_ARCH_IXP23XX is not set
-# CONFIG_ARCH_IXP4XX is not set
 CONFIG_ARCH_KIRKWOOD=y
-# CONFIG_ARCH_KS8695 is not set
-# CONFIG_ARCH_L7200 is not set
-# CONFIG_ARCH_LH7A40X is not set
-# CONFIG_ARCH_LOKI is not set
-# CONFIG_ARCH_MMP is not set
-# CONFIG_ARCH_MSM is not set
-# CONFIG_ARCH_MV78XX0 is not set
-# CONFIG_ARCH_MXC is not set
-# CONFIG_ARCH_NETX is not set
-# CONFIG_ARCH_NS9XXX is not set
-# CONFIG_ARCH_OMAP is not set
-# CONFIG_ARCH_ORION5X is not set
-# CONFIG_ARCH_PNX4008 is not set
-# CONFIG_ARCH_PXA is not set
-# CONFIG_ARCH_REALVIEW is not set
-# CONFIG_ARCH_RPC is not set
-# CONFIG_ARCH_S3C2410 is not set
-# CONFIG_ARCH_S3C64XX is not set
-# CONFIG_ARCH_SA1100 is not set
 # CONFIG_ARCH_SELECT_MEMORY_MODEL is not set
-# CONFIG_ARCH_SHARK is not set
 # CONFIG_ARCH_SPARSEMEM_DEFAULT is not set
 # CONFIG_ARCH_SUPPORTS_MSI is not set
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
-# CONFIG_ARCH_VERSATILE is not set
-# CONFIG_ARCH_W90X900 is not set
 CONFIG_ARM=y
 # CONFIG_ARM_THUMB is not set
 # CONFIG_ARPD is not set
@@ -59,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
@@ -77,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
@@ -92,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
@@ -139,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
@@ -164,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
@@ -176,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
@@ -186,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