aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic-2.6
diff options
context:
space:
mode:
authorPeter Denison <openwrt@marshadder.org>2008-05-20 21:38:04 +0000
committerPeter Denison <openwrt@marshadder.org>2008-05-20 21:38:04 +0000
commit6755af36b6729be79bcb0f688ebde4b625145d27 (patch)
treee797c2553852080b00a8946974a7ed63707b722d /target/linux/generic-2.6
parent785772a3eb5558d9c3f0843e85ed3cdda5777a56 (diff)
downloadupstream-6755af36b6729be79bcb0f688ebde4b625145d27.tar.gz
upstream-6755af36b6729be79bcb0f688ebde4b625145d27.tar.bz2
upstream-6755af36b6729be79bcb0f688ebde4b625145d27.zip
Revert last 3 commits made in error. Proper versions will come later
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11229 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic-2.6')
-rw-r--r--target/linux/generic-2.6/config-2.6.255
1 files changed, 2 insertions, 3 deletions
diff --git a/target/linux/generic-2.6/config-2.6.25 b/target/linux/generic-2.6/config-2.6.25
index f9b8523e58..5f3bc76400 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 is not set
+CONFIG_IP6_NF_TARGET_IMQ=m
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 is not set
+CONFIG_IP_NF_TARGET_IMQ=m
CONFIG_IP_NF_TARGET_LOG=m
CONFIG_IP_NF_TARGET_MASQUERADE=y
CONFIG_IP_NF_TARGET_NETMAP=m
@@ -1632,7 +1632,6 @@ CONFIG_USB_PEGASUS=m
# 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