[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 6a6dd99..ba42e7c 100644 (file)
--- a/target/linux/orion/config-default
+++ b/target/linux/orion/config-default
@@ -26,7 +26,6 @@ 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"
@@ -90,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
@@ -149,7 +144,6 @@ CONFIG_MACH_DT2=y
 # CONFIG_MACH_TS78XX is not set
 CONFIG_MACH_WNR854T=y
 CONFIG_MACH_WRT350N_V2=y
-# CONFIG_MDIO_BITBANG is not set
 CONFIG_MEDIA_TUNER=m
 # CONFIG_MEDIA_TUNER_CUSTOMIZE is not set
 CONFIG_MEDIA_TUNER_MT20XX=m
@@ -206,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
@@ -217,7 +210,6 @@ CONFIG_SLABINFO=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
@@ -255,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