diff options
| author | Peter Denison <openwrt@marshadder.org> | 2008-05-20 21:21:23 +0000 |
|---|---|---|
| committer | Peter Denison <openwrt@marshadder.org> | 2008-05-20 21:21:23 +0000 |
| commit | 19f15b44ea00941e174723ff0732404289282204 (patch) | |
| tree | f21a6fa53b87626e0d318e07463ca73572d16b3d | |
| parent | 21401f537a160cc2dcbc948bf1fd5858f3a985a9 (diff) | |
| download | upstream-19f15b44ea00941e174723ff0732404289282204.tar.gz upstream-19f15b44ea00941e174723ff0732404289282204.tar.bz2 upstream-19f15b44ea00941e174723ff0732404289282204.zip | |
Update generic-2.6 and brcm47xx 2.6.25 configs
SVN-Revision: 11227
| -rw-r--r-- | target/linux/brcm47xx/config-2.6.25 | 2 | ||||
| -rw-r--r-- | target/linux/generic-2.6/config-2.6.25 | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/target/linux/brcm47xx/config-2.6.25 b/target/linux/brcm47xx/config-2.6.25 index 3ca3f7116b..054f8a3b74 100644 --- a/target/linux/brcm47xx/config-2.6.25 +++ b/target/linux/brcm47xx/config-2.6.25 @@ -89,6 +89,7 @@ CONFIG_INPUT_POLLDEV=y # CONFIG_IP6_NF_MATCH_OPTS is not set # CONFIG_IP6_NF_MATCH_RT is not set # CONFIG_IP6_NF_TARGET_HL is not set +# CONFIG_IP6_NF_TARGET_IMQ is not set CONFIG_IPW2200_QOS=y # CONFIG_IP_ROUTE_VERBOSE is not set CONFIG_IRQ_CPU=y @@ -167,6 +168,7 @@ CONFIG_NETDEV_1000=y CONFIG_PAGE_SIZE_4KB=y # CONFIG_PAGE_SIZE_64KB is not set # CONFIG_PAGE_SIZE_8KB is not set +CONFIG_PCI=y # CONFIG_PMC_MSP is not set # CONFIG_PMC_YOSEMITE is not set # CONFIG_PNX8550_JBS is not set diff --git a/target/linux/generic-2.6/config-2.6.25 b/target/linux/generic-2.6/config-2.6.25 index f0ce4d30ed..f9b8523e58 100644 --- a/target/linux/generic-2.6/config-2.6.25 +++ b/target/linux/generic-2.6/config-2.6.25 @@ -544,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_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 @@ -634,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_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 |