From 2ff1562c56280c7a43f2dab4f865439b3a9e9e79 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Mon, 16 Mar 2009 15:17:23 +0100 Subject: [PATCH] --- yaml --- r: 135491 b: refs/heads/master c: 67c0d57930ff9a24c6c34abee1b01f7716a9b0e2 h: refs/heads/master i: 135489: 8080c3f495a1b56c5fe040b51c5ca2c42df4fcb6 135487: d1ecd8f65f5a3e873bfd8885ab9d7540c9764bea v: v3 --- [refs] | 2 +- trunk/net/ipv4/netfilter/Kconfig | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 97213f20d423..5bcc6fceeb3c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9d2493f88f846b391a15a736efc7f4b97d6c4046 +refs/heads/master: 67c0d57930ff9a24c6c34abee1b01f7716a9b0e2 diff --git a/trunk/net/ipv4/netfilter/Kconfig b/trunk/net/ipv4/netfilter/Kconfig index f8d6180938d5..1833bdbf9805 100644 --- a/trunk/net/ipv4/netfilter/Kconfig +++ b/trunk/net/ipv4/netfilter/Kconfig @@ -31,7 +31,7 @@ config NF_CONNTRACK_PROC_COMPAT default y help This option enables /proc and sysctl compatibility with the old - layer 3 dependant connection tracking. This is needed to keep + layer 3 dependent connection tracking. This is needed to keep old programs that have not been adapted to the new names working. If unsure, say Y. @@ -99,7 +99,7 @@ config IP_NF_MATCH_TTL ---help--- This is a backwards-compat option for the user's convenience (e.g. when running oldconfig). It selects - COFNIG_NETFILTER_XT_MATCH_HL. + CONFIG_NETFILTER_XT_MATCH_HL. # `filter', generic and specific targets config IP_NF_FILTER @@ -329,7 +329,7 @@ config IP_NF_TARGET_TTL ---help--- This is a backwards-compat option for the user's convenience (e.g. when running oldconfig). It selects - COFNIG_NETFILTER_XT_TARGET_HL. + CONFIG_NETFILTER_XT_TARGET_HL. # raw + specific targets config IP_NF_RAW