Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6

[powerpc.git] / include / net / ip.h

diff --git a/include/net/ip.h b/include/net/ip.h
index f7e7fd7..7bb5804 100644 (file)
--- a/include/net/ip.h
+++ b/include/net/ip.h
@@ -317,7 +317,6 @@ enum ip_defrag_users
        IP_DEFRAG_CALL_RA_CHAIN,
        IP_DEFRAG_CONNTRACK_IN,
        IP_DEFRAG_CONNTRACK_OUT,
-       IP_DEFRAG_NAT_OUT,
        IP_DEFRAG_VS_IN,
        IP_DEFRAG_VS_OUT,
        IP_DEFRAG_VS_FWD