git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'work.poll2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
[sfrench/cifs-2.6.git]
/
fs
/
fcntl.c
diff --git
a/fs/fcntl.c
b/fs/fcntl.c
index e95fa0a352eaaf0c5f1196b9e444ceafd97baba6..4fc731876d6ba94f45767abe9884bbcb9a5d48d0 100644
(file)
--- a/
fs/fcntl.c
+++ b/
fs/fcntl.c
@@
-26,7
+26,7
@@
#include <linux/shmem_fs.h>
#include <linux/compat.h>
-#include <
asm
/poll.h>
+#include <
linux
/poll.h>
#include <asm/siginfo.h>
#include <linux/uaccess.h>