Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog

[linux-2.6-omap-h63xx.git] / include / linux / netfilter_ipv4 / ipt_LOG.h

diff --git a/include/linux/netfilter_ipv4/ipt_LOG.h b/include/linux/netfilter_ipv4/ipt_LOG.h
index 892f9a33fea88eff56fcb94ae9247705a3a44814..90fa6525ef9c8bb731015bfd6e4f309a717a4c38 100644 (file)
--- a/include/linux/netfilter_ipv4/ipt_LOG.h
+++ b/include/linux/netfilter_ipv4/ipt_LOG.h
@@ -6,7 +6,7 @@
 #define IPT_LOG_TCPOPT         0x02    /* Log TCP options */
 #define IPT_LOG_IPOPT          0x04    /* Log IP options */
 #define IPT_LOG_UID            0x08    /* Log UID owning local socket */
-#define IPT_LOG_NFLOG          0x10    /* Log using nf_log backend */
+#define IPT_LOG_NFLOG          0x10    /* Unsupported, don't reuse */
 #define IPT_LOG_MASK           0x1f
 
 struct ipt_log_info {