Merge master.kernel.org:/home/rmk/linux-2.6-mmc

[linux-2.6-omap-h63xx.git] / include / net / act_generic.h

diff --git a/include/net/act_generic.h b/include/net/act_generic.h
index 95b120781c14696b40e9f9528e414289e9051ac5..c9daa7e52300da04d17defe8ec49ab79ea743166 100644 (file)
--- a/include/net/act_generic.h
+++ b/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;