From 099971bd5798506a3c6e35119de2fc240cf25f1e Mon Sep 17 00:00:00 2001
From: Boaz Harrosh <bharrosh@panasas.com>
Date: Thu, 3 Dec 2009 20:28:47 +0200
Subject: [PATCH] --- yaml --- r: 177190 b: refs/heads/master c:
 d703158229329af7152d159753f849aa7bd55ee6 h: refs/heads/master v: v3

---
 [refs]                        | 2 +-
 trunk/include/linux/nfs_xdr.h | 1 +
 trunk/include/linux/nfsacl.h  | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 41a2da135de3..b410998d2a08 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a600ffcbb3743cf1296bee2a41d4824c719d7181
+refs/heads/master: d703158229329af7152d159753f849aa7bd55ee6
diff --git a/trunk/include/linux/nfs_xdr.h b/trunk/include/linux/nfs_xdr.h
index 62f63fb0c4c8..00a0c8170816 100644
--- a/trunk/include/linux/nfs_xdr.h
+++ b/trunk/include/linux/nfs_xdr.h
@@ -2,6 +2,7 @@
 #define _LINUX_NFS_XDR_H
 
 #include <linux/nfsacl.h>
+#include <linux/nfs3.h>
 
 /*
  * To change the maximum rsize and wsize supported by the NFS client, adjust
diff --git a/trunk/include/linux/nfsacl.h b/trunk/include/linux/nfsacl.h
index 43011b69297c..f321b578edeb 100644
--- a/trunk/include/linux/nfsacl.h
+++ b/trunk/include/linux/nfsacl.h
@@ -29,6 +29,7 @@
 #ifdef __KERNEL__
 
 #include <linux/posix_acl.h>
+#include <linux/sunrpc/xdr.h>
 
 /* Maximum number of ACL entries over NFS */
 #define NFS_ACL_MAX_ENTRIES	1024