cleanup ifxmips and add support for both ttyS

[openwrt.git] / target / linux / generic-2.6 / config-2.6.25

diff --git a/target/linux/generic-2.6/config-2.6.25 b/target/linux/generic-2.6/config-2.6.25
index a0c893a..6773e20 100644 (file)
--- a/target/linux/generic-2.6/config-2.6.25
+++ b/target/linux/generic-2.6/config-2.6.25
@@ -5,6 +5,7 @@
 # CONFIG_ACORN_PARTITION is not set
 # CONFIG_ADAPTEC_STARFIRE is not set
 # CONFIG_ADFS_FS is not set
+# CONFIG_ADM6996_PHY is not set
 # CONFIG_AFFS_FS is not set
 # CONFIG_AFS_FS is not set
 # CONFIG_AF_RXRPC is not set
@@ -319,6 +320,7 @@ CONFIG_DEVFS_MOUNT=y
 # CONFIG_DVB_CORE is not set
 CONFIG_E100=m
 # CONFIG_E1000 is not set
+# CONFIG_E1000E is not set
 # CONFIG_ECONET is not set
 # CONFIG_EEPRO100 is not set
 CONFIG_EEPROM_93CX6=m
@@ -464,9 +466,10 @@ CONFIG_IEEE80211_CRYPT_WEP=m
 CONFIG_IEEE80211_SOFTMAC=m
 # CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
 CONFIG_IFB=m
+# CONFIG_IGB is not set
 # CONFIG_IKCONFIG is not set
 # CONFIG_IKCONFIG_PROC is not set
-# CONFIG_IMQ is not set
+CONFIG_IMQ=m
 # CONFIG_IMQ_BEHAVIOR_AA is not set
 # CONFIG_IMQ_BEHAVIOR_AB is not set
 CONFIG_IMQ_BEHAVIOR_BA=y
@@ -524,6 +527,7 @@ CONFIG_INPUT_EVDEV=m
 # CONFIG_IOSCHED_CFQ is not set
 CONFIG_IOSCHED_DEADLINE=y
 CONFIG_IOSCHED_NOOP=y
+# CONFIG_IP1000 is not set
 CONFIG_IP6_NF_FILTER=m
 CONFIG_IP6_NF_IPTABLES=m
 CONFIG_IP6_NF_MANGLE=m
@@ -766,6 +770,7 @@ CONFIG_MSDOS_PARTITION=y
 CONFIG_MTD_ROOTFS_ROOT_DEV=y
 CONFIG_MTD_ROOTFS_SPLIT=y
 # CONFIG_MTD_UBI is not set
+# CONFIG_MVSWITCH_PHY is not set
 # CONFIG_MWAVE is not set
 # CONFIG_MYRI10GE is not set
 # CONFIG_NAMESPACES is not set
@@ -776,7 +781,7 @@ CONFIG_NET=y
 # CONFIG_NETDEBUG is not set
 CONFIG_NETDEVICES=y
 # CONFIG_NETDEVICES_MULTIQUEUE is not set
-# CONFIG_NETDEV_1000 is not set
+CONFIG_NETDEV_1000=y
 # CONFIG_NETDEV_10000 is not set
 CONFIG_NETFILTER=y
 CONFIG_NETFILTER_ADVANCED=y