diff --git a/[refs] b/[refs] index e7e132e070e5..b5e0a710f5ae 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f790c0ca6fad60b544bb73eda8cc841a6436725b +refs/heads/master: 63e690caf24e8f43ba019fe1107669746b072d80 diff --git a/trunk/include/linux/netfilter/nf_conntrack_tuple_common.h b/trunk/include/linux/netfilter/nf_conntrack_tuple_common.h index 8e145f0d61cb..2ea22b018a87 100644 --- a/trunk/include/linux/netfilter/nf_conntrack_tuple_common.h +++ b/trunk/include/linux/netfilter/nf_conntrack_tuple_common.h @@ -1,8 +1,7 @@ #ifndef _NF_CONNTRACK_TUPLE_COMMON_H #define _NF_CONNTRACK_TUPLE_COMMON_H -enum ip_conntrack_dir -{ +enum ip_conntrack_dir { IP_CT_DIR_ORIGINAL, IP_CT_DIR_REPLY, IP_CT_DIR_MAX