Merge branch 'master' into gfs2

[linux-2.6] / fs / gfs2 / acl.h

diff --git a/fs/gfs2/acl.h b/fs/gfs2/acl.h
index 067105786eaa82a4fd0b9d36215c200b79fb442f..05c294fe0d780f9c28a4cef0d8ebdcfa2a5deffc 100644 (file)
--- a/fs/gfs2/acl.h
+++ b/fs/gfs2/acl.h
@@ -4,12 +4,14 @@
  *
  * This copyrighted material is made available to anyone wishing to use,
  * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU General Public License v.2.
+ * of the GNU General Public License version 2.
  */
 
 #ifndef __ACL_DOT_H__
 #define __ACL_DOT_H__
 
+#include "incore.h"
+
 #define GFS2_POSIX_ACL_ACCESS          "posix_acl_access"
 #define GFS2_POSIX_ACL_ACCESS_LEN      16
 #define GFS2_POSIX_ACL_DEFAULT         "posix_acl_default"