summaryrefslogtreecommitdiffstats
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
commitfec4d9ee3c383cc0deaeeeaabcf5f8ebc40600ba (patch)
tree85d7feae1a5950c0174285ecdb29c7a845f0d740 /target/linux/x86
parent1e758b6e0551a3ba099215fdd801e9c92b5de72b (diff)
downloadmaster-31e0f0ae-fec4d9ee3c383cc0deaeeeaabcf5f8ebc40600ba.tar.gz
master-31e0f0ae-fec4d9ee3c383cc0deaeeeaabcf5f8ebc40600ba.tar.bz2
master-31e0f0ae-fec4d9ee3c383cc0deaeeeaabcf5f8ebc40600ba.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.
SVN-Revision: 8955
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