diff --git a/[refs] b/[refs] index 28f8d77c3e3a..d9b6be7b83f2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 31c26852cb2ac77f1d4acb37bcf31f165fd5eb68 +refs/heads/master: 1eda339e76a9aac05883c548028bf91aed734783 diff --git a/trunk/include/net/act_generic.h b/trunk/include/net/act_generic.h index 95b120781c14..c9daa7e52300 100644 --- a/trunk/include/net/act_generic.h +++ b/trunk/include/net/act_generic.h @@ -2,8 +2,8 @@ * include/net/act_generic.h * */ -#ifndef ACT_GENERIC_H -#define ACT_GENERIC_H +#ifndef _NET_ACT_GENERIC_H +#define _NET_ACT_GENERIC_H static inline int tcf_defact_release(struct tcf_defact *p, int bind) { int ret = 0;