projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[cascardo/linux.git]
/
fs
/
lockd
/
clntlock.c
diff --git
a/fs/lockd/clntlock.c
b/fs/lockd/clntlock.c
index
d5bb868
..
25509eb
100644
(file)
--- a/
fs/lockd/clntlock.c
+++ b/
fs/lockd/clntlock.c
@@
-14,7
+14,6
@@
#include <linux/sunrpc/clnt.h>
#include <linux/sunrpc/svc.h>
#include <linux/lockd/lockd.h>
-#include <linux/smp_lock.h>
#include <linux/kthread.h>
#define NLMDBG_FACILITY NLMDBG_CLIENT