[adm5120] do not overrid CONFIG_BRIDGE (#5163)

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

diff --git a/target/linux/ixp4xx/config-2.6.28 b/target/linux/ixp4xx/config-2.6.28
index 8691f68..4360a4c 100644 (file)
--- a/target/linux/ixp4xx/config-2.6.28
+++ b/target/linux/ixp4xx/config-2.6.28
@@ -195,14 +195,12 @@ CONFIG_SENSORS_W83781D=y
 # CONFIG_SERIAL_8250_EXTENDED is not set
 CONFIG_SERIAL_8250_NR_UARTS=4
 CONFIG_SERIAL_8250_RUNTIME_UARTS=4
 # CONFIG_SERIAL_8250_EXTENDED is not set
 CONFIG_SERIAL_8250_NR_UARTS=4
 CONFIG_SERIAL_8250_RUNTIME_UARTS=4

-# CONFIG_SHMEM is not set

 CONFIG_SLABINFO=y
 # CONFIG_SND_ARM is not set
 CONFIG_SND_USB=y
 CONFIG_SPLIT_PTLOCK_CPUS=4096
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
 CONFIG_TICK_ONESHOT=y
 CONFIG_SLABINFO=y
 # CONFIG_SND_ARM is not set
 CONFIG_SND_USB=y
 CONFIG_SPLIT_PTLOCK_CPUS=4096
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
 CONFIG_TICK_ONESHOT=y

-CONFIG_TINY_SHMEM=y

 CONFIG_UID16=y
 # CONFIG_USB is not set
 CONFIG_USB_EHCI_BIG_ENDIAN_DESC=y
 CONFIG_UID16=y
 # CONFIG_USB is not set
 CONFIG_USB_EHCI_BIG_ENDIAN_DESC=y