[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 35e735b..ba42e7c 100644 (file)
--- a/target/linux/orion/config-default
+++ b/target/linux/orion/config-default
@@ -200,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_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
 CONFIG_SLABINFO=y
 # CONFIG_SMC91X is not set
 # CONFIG_SND_ARM is not set


@@ -211,7 +210,6 @@ CONFIG_SLABINFO=y
 CONFIG_SPLIT_PTLOCK_CPUS=4096
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
 CONFIG_TICK_ONESHOT=y
 CONFIG_SPLIT_PTLOCK_CPUS=4096
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
 CONFIG_TICK_ONESHOT=y

-CONFIG_TINY_SHMEM=y

 # CONFIG_TUN is not set
 CONFIG_UID16=y
 CONFIG_USB=m
 # CONFIG_TUN is not set
 CONFIG_UID16=y
 CONFIG_USB=m