Update generic-2.6 and brcm47xx 2.6.25 configs

[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..f9b8523 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_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
 # 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_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
 # CONFIG_ECONET is not set
 # CONFIG_EEPRO100 is not set
 CONFIG_EEPROM_93CX6=m


@@ -464,6 +466,7 @@ CONFIG_IEEE80211_CRYPT_WEP=m
 CONFIG_IEEE80211_SOFTMAC=m
 # CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
 CONFIG_IFB=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_IKCONFIG is not set
 # CONFIG_IKCONFIG_PROC is not set
 # CONFIG_IMQ is not set


@@ -524,6 +527,7 @@ CONFIG_INPUT_EVDEV=m
 # CONFIG_IOSCHED_CFQ is not set
 CONFIG_IOSCHED_DEADLINE=y
 CONFIG_IOSCHED_NOOP=y
 # 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
 CONFIG_IP6_NF_FILTER=m
 CONFIG_IP6_NF_IPTABLES=m
 CONFIG_IP6_NF_MANGLE=m


@@ -540,7 +544,7 @@ CONFIG_IP6_NF_MATCH_RT=m
 CONFIG_IP6_NF_QUEUE=m
 CONFIG_IP6_NF_RAW=m
 CONFIG_IP6_NF_TARGET_HL=m
 CONFIG_IP6_NF_QUEUE=m
 CONFIG_IP6_NF_RAW=m
 CONFIG_IP6_NF_TARGET_HL=m

-CONFIG_IP6_NF_TARGET_IMQ=m
+# CONFIG_IP6_NF_TARGET_IMQ is not set

 CONFIG_IP6_NF_TARGET_LOG=m
 CONFIG_IP6_NF_TARGET_REJECT=m
 CONFIG_IP6_NF_TARGET_ROUTE=m
 CONFIG_IP6_NF_TARGET_LOG=m
 CONFIG_IP6_NF_TARGET_REJECT=m
 CONFIG_IP6_NF_TARGET_ROUTE=m


@@ -630,7 +634,7 @@ CONFIG_IP_NF_SET_PORTMAP=m
 CONFIG_IP_NF_SIP=m
 # CONFIG_IP_NF_TARGET_CLUSTERIP is not set
 CONFIG_IP_NF_TARGET_ECN=m
 CONFIG_IP_NF_SIP=m
 # CONFIG_IP_NF_TARGET_CLUSTERIP is not set
 CONFIG_IP_NF_TARGET_ECN=m

-CONFIG_IP_NF_TARGET_IMQ=m
+# CONFIG_IP_NF_TARGET_IMQ is not set

 CONFIG_IP_NF_TARGET_LOG=m
 CONFIG_IP_NF_TARGET_MASQUERADE=y
 CONFIG_IP_NF_TARGET_NETMAP=m
 CONFIG_IP_NF_TARGET_LOG=m
 CONFIG_IP_NF_TARGET_MASQUERADE=y
 CONFIG_IP_NF_TARGET_NETMAP=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_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
 # 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_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
 # CONFIG_NETDEV_10000 is not set
 CONFIG_NETFILTER=y
 CONFIG_NETFILTER_ADVANCED=y


@@ -1627,6 +1632,7 @@ CONFIG_USB_PEGASUS=m
 # CONFIG_USB_POWERMATE is not set
 CONFIG_USB_PRINTER=m
 # CONFIG_USB_QUICKCAM_MESSENGER is not set
 # CONFIG_USB_POWERMATE is not set
 CONFIG_USB_PRINTER=m
 # CONFIG_USB_QUICKCAM_MESSENGER is not set

+# CONFIG_R8A66597_HCD is not set

 # CONFIG_USB_RIO500 is not set
 # CONFIG_USB_RTL8150 is not set
 # CONFIG_USB_SE401 is not set
 # CONFIG_USB_RIO500 is not set
 # CONFIG_USB_RTL8150 is not set
 # CONFIG_USB_SE401 is not set