git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge commit 'v2.6.34-rc6'
[safe/jmp/linux-2.6]
/
fs
/
nfsd
/
nfs4callback.c
diff --git
a/fs/nfsd/nfs4callback.c
b/fs/nfsd/nfs4callback.c
index
ea77aa6
..
1d5051d
100644
(file)
--- a/
fs/nfsd/nfs4callback.c
+++ b/
fs/nfsd/nfs4callback.c
@@
-33,6
+33,7
@@
#include <linux/sunrpc/clnt.h>
#include <linux/sunrpc/svc_xprt.h>
+#include <linux/slab.h>
#include "nfsd.h"
#include "state.h"