[adm5120] do not overrid CONFIG_BRIDGE (#5163)

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

diff --git a/target/linux/orion/config-default b/target/linux/orion/config-default
index 35dc44f..ba42e7c 100644 (file)
--- a/target/linux/orion/config-default
+++ b/target/linux/orion/config-default
@@ -1,51 +1,13 @@
 # CONFIG_8139TOO is not set
 # 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_CLPS7500 is not set
-# CONFIG_ARCH_CO285 is not set
-# CONFIG_ARCH_DAVINCI is not set
 # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
-# CONFIG_ARCH_EBSA110 is not set
-# CONFIG_ARCH_EP93XX is not set
-# CONFIG_ARCH_FOOTBRIDGE 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 is not set
-# 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_MSM is not set
-# CONFIG_ARCH_MSM7X00A is not set
-# CONFIG_ARCH_MXC is not set
-# CONFIG_ARCH_MV78XX0 is not set
-# CONFIG_ARCH_NETX is not set
-# CONFIG_ARCH_NS9XXX is not set
-# CONFIG_ARCH_OMAP is not set
 CONFIG_ARCH_ORION5X=y
-# 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_SA1100 is not set
-# CONFIG_ARCH_SHARK is not set
 CONFIG_ARCH_SUPPORTS_AOUT=y
 # CONFIG_ARCH_SUPPORTS_MSI is not set
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
-# CONFIG_ARCH_VERSATILE is not set
 CONFIG_ARM=y
 # CONFIG_ARM_THUMB is not set
 # CONFIG_ARPD is not set
@@ -64,11 +26,9 @@ CONFIG_BITREVERSE=y
 # CONFIG_BONDING is not set
 CONFIG_BOUNCE=y
 # CONFIG_BSD_DISKLABEL is not set
-# CONFIG_BT is not set
 # CONFIG_CIFS_STATS is not set
 CONFIG_CLASSIC_RCU=y
-CONFIG_CMDLINE="root=/dev/mtdblock1 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200 init=/etc/preinit"
-# CONFIG_CONFIGFS_FS is not set
+CONFIG_CMDLINE="root=/dev/mtdblock1 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"
 CONFIG_CPU_32=y
 CONFIG_CPU_32v5=y
 CONFIG_CPU_ABRT_EV5T=y
@@ -86,9 +46,6 @@ CONFIG_CRC16=y
 # CONFIG_CRC_CCITT is not set
 # 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_DLCI=m
 CONFIG_DLCI_MAX=8
@@ -132,10 +89,6 @@ CONFIG_I2C=y
 CONFIG_I2C_BOARDINFO=y
 CONFIG_I2C_CHARDEV=y
 CONFIG_I2C_MV64XXX=y
-# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
-# CONFIG_IBM_NEW_EMAC_RGMII is not set
-# CONFIG_IBM_NEW_EMAC_TAH is not set
-# CONFIG_IBM_NEW_EMAC_ZMII is not set
 # CONFIG_IDE is not set
 CONFIG_INITRAMFS_SOURCE=""
 # CONFIG_IP6_NF_MANGLE is not set
@@ -191,8 +144,6 @@ CONFIG_MACH_DT2=y
 # CONFIG_MACH_TS78XX is not set
 CONFIG_MACH_WNR854T=y
 CONFIG_MACH_WRT350N_V2=y
-# CONFIG_MAC_PARTITION is not set
-# CONFIG_MDIO_BITBANG is not set
 CONFIG_MEDIA_TUNER=m
 # CONFIG_MEDIA_TUNER_CUSTOMIZE is not set
 CONFIG_MEDIA_TUNER_MT20XX=m
@@ -249,7 +200,6 @@ CONFIG_SATA_PMP=y
 # CONFIG_SCSI_MULTI_LUN is not set
 # CONFIG_SENSORS_PC87360 is not set
 # CONFIG_SERIAL_8250_EXTENDED is not set
-# CONFIG_SHMEM is not set
 CONFIG_SLABINFO=y
 # CONFIG_SMC91X is not set
 # CONFIG_SND_ARM is not set
@@ -258,17 +208,8 @@ CONFIG_SLABINFO=y
 # CONFIG_SOUND is not set
 # CONFIG_SPI_ORION is not set
 CONFIG_SPLIT_PTLOCK_CPUS=4096
-# CONFIG_SWAP is not set
 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=m
-# CONFIG_TCP_CONG_VENO is not set
-CONFIG_TCP_CONG_WESTWOOD=y
 CONFIG_TICK_ONESHOT=y
-CONFIG_TINY_SHMEM=y
 # CONFIG_TUN is not set
 CONFIG_UID16=y
 CONFIG_USB=m
@@ -306,9 +247,6 @@ CONFIG_VECTORS_BASE=0xffff0000
 # CONFIG_VGASTATE is not set
 # CONFIG_VIA_RHINE is not set
 CONFIG_VIDEO_MEDIA=m
-CONFIG_VIDEO_V4L1=m
-CONFIG_VIDEO_V4L2=m
-CONFIG_VIDEO_V4L2_COMMON=m
 CONFIG_VM_EVENT_COUNTERS=y
 # CONFIG_VIDEO_SAA717X is not set
 # CONFIG_USB_VIDEO_CLASS is not set