projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
[powerpc.git]
/
fs
/
lockd
/
clntproc.c
diff --git
a/fs/lockd/clntproc.c
b/fs/lockd/clntproc.c
index
a5c019e
..
a10343b
100644
(file)
--- a/
fs/lockd/clntproc.c
+++ b/
fs/lockd/clntproc.c
@@
-12,7
+12,6
@@
#include <linux/fs.h>
#include <linux/nfs_fs.h>
#include <linux/utsname.h>
-#include <linux/smp_lock.h>
#include <linux/freezer.h>
#include <linux/sunrpc/clnt.h>
#include <linux/sunrpc/svc.h>