aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/x86
diff options
context:
space:
mode:
authorNicolas Thill <nico@openwrt.org>2007-09-22 18:37:24 +0000
committerNicolas Thill <nico@openwrt.org>2007-09-22 18:37:24 +0000
commiteffa8fa4fd65c6e341dc4a534871c3c276a5e28e (patch)
treef0f18be80ab0af4e68161afe5dc5eada611ab435 /target/linux/x86
parentc5ea115a4e499e18375989272daf54e39967cb5c (diff)
downloadupstream-effa8fa4fd65c6e341dc4a534871c3c276a5e28e.tar.gz
upstream-effa8fa4fd65c6e341dc4a534871c3c276a5e28e.tar.bz2
upstream-effa8fa4fd65c6e341dc4a534871c3c276a5e28e.zip
add missing 2.6 conntrack/nat helpers, add 2.6 conntrack/nat helper for RTSP (closes: #2297, thanks to aorlinsk), sync 2.4 / 2.6 kconfigs.
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8955 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/x86')
-rw-r--r--target/linux/x86/config-2.6.221
1 files changed, 0 insertions, 1 deletions
diff --git a/target/linux/x86/config-2.6.22 b/target/linux/x86/config-2.6.22
index 3df0c5fe7b..a848fa96e6 100644
--- a/target/linux/x86/config-2.6.22
+++ b/target/linux/x86/config-2.6.22
@@ -151,7 +151,6 @@ CONFIG_INPUT_MOUSEDEV=y
CONFIG_INPUT_MOUSEDEV_PSAUX=y
CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
-# CONFIG_IP_NF_SET_IPPORTHASH is not set
CONFIG_IRQBALANCE=y
CONFIG_ISA=y
CONFIG_ISAPNP=y