From 623aa6c5c9f9359c4cbd0ff276e26ceb64968725 Mon Sep 17 00:00:00 2001
From: Eric Leblond <eric@inl.fr>
Date: Wed, 10 Dec 2008 17:24:33 -0800
Subject: [PATCH] --- yaml --- r: 122587 b: refs/heads/master c:
 293a4f28333a38aa75254bfb01a5102afc981809 h: refs/heads/master i:   122585:
 daa08f3e46abb11098761104ab02b35337196254   122583:
 51666781e18729b6d5522959fef83cdf573db757 v: v3

---
 [refs]                      | 2 +-
 trunk/net/netfilter/Kconfig | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index ec086799b42f..2eb0369f426b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8229efdaef1e7913ae1712c0ba752f267e5fcd5e
+refs/heads/master: 293a4f28333a38aa75254bfb01a5102afc981809
diff --git a/trunk/net/netfilter/Kconfig b/trunk/net/netfilter/Kconfig
index 25dcef9f2194..c2bac9cd0caf 100644
--- a/trunk/net/netfilter/Kconfig
+++ b/trunk/net/netfilter/Kconfig
@@ -373,11 +373,10 @@ config NETFILTER_XT_TARGET_MARK
 config NETFILTER_XT_TARGET_NFLOG
 	tristate '"NFLOG" target support'
 	default m if NETFILTER_ADVANCED=n
+	select NETFILTER_NETLINK_LOG
 	help
 	  This option enables the NFLOG target, which allows to LOG
-	  messages through the netfilter logging API, which can use
-	  either the old LOG target, the old ULOG target or nfnetlink_log
-	  as backend.
+	  messages through nfnetlink_log.
 
 	  To compile it as a module, choose M here.  If unsure, say N.