Update generic-2.6 and brcm47xx 2.6.25 configs

SVN-Revision: 11227
This commit is contained in:
Peter Denison 2008-05-20 21:21:23 +00:00
parent 21401f537a
commit 19f15b44ea
2 changed files with 4 additions and 2 deletions

View File

@ -89,6 +89,7 @@ CONFIG_INPUT_POLLDEV=y
# CONFIG_IP6_NF_MATCH_OPTS is not set # CONFIG_IP6_NF_MATCH_OPTS is not set
# CONFIG_IP6_NF_MATCH_RT is not set # CONFIG_IP6_NF_MATCH_RT is not set
# CONFIG_IP6_NF_TARGET_HL is not set # CONFIG_IP6_NF_TARGET_HL is not set
# CONFIG_IP6_NF_TARGET_IMQ is not set
CONFIG_IPW2200_QOS=y CONFIG_IPW2200_QOS=y
# CONFIG_IP_ROUTE_VERBOSE is not set # CONFIG_IP_ROUTE_VERBOSE is not set
CONFIG_IRQ_CPU=y CONFIG_IRQ_CPU=y
@ -167,6 +168,7 @@ CONFIG_NETDEV_1000=y
CONFIG_PAGE_SIZE_4KB=y CONFIG_PAGE_SIZE_4KB=y
# CONFIG_PAGE_SIZE_64KB is not set # CONFIG_PAGE_SIZE_64KB is not set
# CONFIG_PAGE_SIZE_8KB is not set # CONFIG_PAGE_SIZE_8KB is not set
CONFIG_PCI=y
# CONFIG_PMC_MSP is not set # CONFIG_PMC_MSP is not set
# CONFIG_PMC_YOSEMITE is not set # CONFIG_PMC_YOSEMITE is not set
# CONFIG_PNX8550_JBS is not set # CONFIG_PNX8550_JBS is not set

View File

@ -544,7 +544,7 @@ CONFIG_IP6_NF_MATCH_RT=m
CONFIG_IP6_NF_QUEUE=m CONFIG_IP6_NF_QUEUE=m
CONFIG_IP6_NF_RAW=m CONFIG_IP6_NF_RAW=m
CONFIG_IP6_NF_TARGET_HL=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_LOG=m
CONFIG_IP6_NF_TARGET_REJECT=m CONFIG_IP6_NF_TARGET_REJECT=m
CONFIG_IP6_NF_TARGET_ROUTE=m CONFIG_IP6_NF_TARGET_ROUTE=m
@ -634,7 +634,7 @@ CONFIG_IP_NF_SET_PORTMAP=m
CONFIG_IP_NF_SIP=m CONFIG_IP_NF_SIP=m
# CONFIG_IP_NF_TARGET_CLUSTERIP is not set # CONFIG_IP_NF_TARGET_CLUSTERIP is not set
CONFIG_IP_NF_TARGET_ECN=m 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_LOG=m
CONFIG_IP_NF_TARGET_MASQUERADE=y CONFIG_IP_NF_TARGET_MASQUERADE=y
CONFIG_IP_NF_TARGET_NETMAP=m CONFIG_IP_NF_TARGET_NETMAP=m