summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrwhitby <rwhitby@3c298f89-4303-0410-b956-a3cf2f4a3e73>2008-05-13 12:48:25 +0000
committerrwhitby <rwhitby@3c298f89-4303-0410-b956-a3cf2f4a3e73>2008-05-13 12:48:25 +0000
commit5225a2441f410f4c0e7c8fb7871cc38d748acc38 (patch)
tree82b44eb90fec90f89481086c94a4fbaa9a3b625e
parentd7a84ea22a945595a095ed61cf5dce52d1d832b0 (diff)
config-2.6.25: Enable NETDEV_1000, so that the via-velocity gigabit ethernet driver for the DSMG600RevA can be selected.
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11134 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--target/linux/generic-2.6/config-2.6.255
-rw-r--r--target/linux/ixp4xx/config-default1
2 files changed, 4 insertions, 2 deletions
diff --git a/target/linux/generic-2.6/config-2.6.25 b/target/linux/generic-2.6/config-2.6.25
index a0c893aa5..c5e758959 100644
--- a/target/linux/generic-2.6/config-2.6.25
+++ b/target/linux/generic-2.6/config-2.6.25
@@ -319,6 +319,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,6 +465,7 @@ 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
@@ -524,6 +526,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
@@ -776,7 +779,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
diff --git a/target/linux/ixp4xx/config-default b/target/linux/ixp4xx/config-default
index 2c459caed..0f5923c1c 100644
--- a/target/linux/ixp4xx/config-default
+++ b/target/linux/ixp4xx/config-default
@@ -287,7 +287,6 @@ CONFIG_MTD_REDBOOT_PARTS_READONLY=y
# CONFIG_MTD_SLRAM is not set
# CONFIG_NATSEMI is not set
# CONFIG_NE2K_PCI is not set
-# CONFIG_NETDEV_1000 is not set
# CONFIG_NET_CLS_ACT is not set
# CONFIG_NET_CLS_IND is not set
# CONFIG_NET_EMATCH is not set