aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--target/linux/generic-2.6/config-2.6.3411
-rw-r--r--target/linux/orion/config-default6
2 files changed, 16 insertions, 1 deletions
diff --git a/target/linux/generic-2.6/config-2.6.34 b/target/linux/generic-2.6/config-2.6.34
index cf629d233b..17dbdb8e7e 100644
--- a/target/linux/generic-2.6/config-2.6.34
+++ b/target/linux/generic-2.6/config-2.6.34
@@ -250,6 +250,7 @@ CONFIG_BLOCK=y
# CONFIG_BOOT_PRINTK_DELAY is not set
# CONFIG_BOOT_TRACER is not set
# CONFIG_BPQETHER is not set
+CONFIG_BRIDGE=y
# CONFIG_BRIDGE_EBT_802_3 is not set
# CONFIG_BRIDGE_EBT_AMONG is not set
# CONFIG_BRIDGE_EBT_ARP is not set
@@ -271,9 +272,9 @@ CONFIG_BLOCK=y
# CONFIG_BRIDGE_EBT_T_NAT is not set
# CONFIG_BRIDGE_EBT_ULOG is not set
# CONFIG_BRIDGE_EBT_VLAN is not set
+CONFIG_BRIDGE_IGMP_SNOOPING=y
# CONFIG_BRIDGE_NETFILTER is not set
# CONFIG_BRIDGE_NF_EBTABLES is not set
-CONFIG_BRIDGE=y
# CONFIG_BROADCOM_PHY is not set
CONFIG_BROKEN_ON_SMP=y
# CONFIG_BSD_DISKLABEL is not set
@@ -321,6 +322,7 @@ CONFIG_CARDBUS=y
# CONFIG_CB710_CORE is not set
# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
# CONFIG_CDROM_PKTCDVD is not set
+# CONFIG_CEPH_FS is not set
# CONFIG_CFG80211 is not set
# CONFIG_CGROUPS is not set
# CONFIG_CHELSIO_T1 is not set
@@ -439,6 +441,7 @@ CONFIG_CRYPTO_UNLZMA=y
# CONFIG_CRYPTO_XTS is not set
CONFIG_CRYPTO=y
CONFIG_CRYPTO_ZLIB=y
+# CONFIG_CRYSTALHD is not set
# CONFIG_CUSE is not set
# CONFIG_DAB is not set
# CONFIG_DAVICOM_PHY is not set
@@ -513,6 +516,7 @@ CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
# CONFIG_DRM is not set
# CONFIG_DS1682 is not set
# CONFIG_DST is not set
+# CONFIG_DT3155 is not set
# CONFIG_DTLK is not set
# CONFIG_DUMMY is not set
# CONFIG_DVB_CORE is not set
@@ -680,6 +684,7 @@ CONFIG_GENERIC_TIME=y
# CONFIG_GPIO_MCP23S08 is not set
# CONFIG_GPIO_PCA953X is not set
# CONFIG_GPIO_PCF857X is not set
+# CONFIG_GPIO_SCH is not set
# CONFIG_GPIO_SYSFS is not set
# CONFIG_GPIO_XILINX is not set
# CONFIG_GREENASIA_FF is not set
@@ -1184,6 +1189,7 @@ CONFIG_KMOD=y
# CONFIG_KS8851 is not set
# CONFIG_KS8851_MLL is not set
# CONFIG_KSM is not set
+# CONFIG_KSZ884X_PCI is not set
# CONFIG_LANMEDIA is not set
# CONFIG_LAPB is not set
# CONFIG_LASAT is not set
@@ -1237,6 +1243,7 @@ CONFIG_LOG_BUF_SHIFT=14
# CONFIG_LOGIRUMBLEPAD2_FF is not set
# CONFIG_LOGITECH_FF is not set
# CONFIG_LOGO is not set
+# CONFIG_LPC_SCH is not set
# CONFIG_LSF is not set
# CONFIG_LSI_ET1011C_PHY is not set
# CONFIG_LTPC is not set
@@ -1255,6 +1262,7 @@ CONFIG_MAC80211_DEFAULT_PS=y
# CONFIG_MARKEINS is not set
# CONFIG_MARKERS is not set
# CONFIG_MARVELL_PHY is not set
+# CONFIG_MAX63XX_WATCHDOG is not set
# CONFIG_MDIO_BITBANG is not set
# CONFIG_MD is not set
# CONFIG_ME4000 is not set
@@ -1277,6 +1285,7 @@ CONFIG_MAC80211_DEFAULT_PS=y
# CONFIG_MFD_SM501 is not set
# CONFIG_MFD_TC6387XB is not set
# CONFIG_MFD_TC6393XB is not set
+# CONFIG_MFD_TIMBERDALE is not set
# CONFIG_MFD_TMIO is not set
# CONFIG_MFD_WM831X is not set
# CONFIG_MFD_WM8350_I2C is not set
diff --git a/target/linux/orion/config-default b/target/linux/orion/config-default
index 58a44edb0d..689f404091 100644
--- a/target/linux/orion/config-default
+++ b/target/linux/orion/config-default
@@ -4,7 +4,12 @@ CONFIG_ALIGNMENT_TRAP=y
# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
# CONFIG_ARCH_HAS_ILOG2_U32 is not set
# CONFIG_ARCH_HAS_ILOG2_U64 is not set
+# CONFIG_ARCH_NUC93X is not set
CONFIG_ARCH_ORION5X=y
+# CONFIG_ARCH_S5P6440 is not set
+# CONFIG_ARCH_S5P6442 is not set
+# CONFIG_ARCH_S5PV210 is not set
+# CONFIG_ARCH_SHMOBILE is not set
CONFIG_ARCH_SUPPORTS_AOUT=y
# CONFIG_ARCH_SUPPORTS_MSI is not set
CONFIG_ARCH_SUSPEND_POSSIBLE=y
@@ -131,6 +136,7 @@ CONFIG_LZO_DECOMPRESS=m
CONFIG_MACH_DT2=y
# CONFIG_MACH_EDMINI_V2 is not set
# CONFIG_MACH_KUROBOX_PRO is not set
+# CONFIG_MACH_LINKSTATION_LS_HGL is not set
# CONFIG_MACH_LINKSTATION_MINI is not set
# CONFIG_MACH_LINKSTATION_PRO is not set
# CONFIG_MACH_MSS2 is not set