git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'drm-ttm-unmappable' into drm-core-next
[pandora-kernel.git]
/
fs
/
nfsd
/
nfs2acl.c
diff --git
a/fs/nfsd/nfs2acl.c
b/fs/nfsd/nfs2acl.c
index
f20589d
..
6aa5590
100644
(file)
--- a/
fs/nfsd/nfs2acl.c
+++ b/
fs/nfsd/nfs2acl.c
@@
-7,6
+7,7
@@
#include "nfsd.h"
/* FIXME: nfsacl.h is a broken header */
#include <linux/nfsacl.h>
+#include <linux/gfp.h>
#include "cache.h"
#include "xdr3.h"
#include "vfs.h"