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 'release' of master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6
[pandora-kernel.git]
/
fs
/
ioctl.c
diff --git
a/fs/ioctl.c
b/fs/ioctl.c
index
5692091
..
4b7660b
100644
(file)
--- a/
fs/ioctl.c
+++ b/
fs/ioctl.c
@@
-4,10
+4,10
@@
* Copyright (C) 1991, 1992 Linus Torvalds
*/
* Copyright (C) 1991, 1992 Linus Torvalds
*/
-#include <linux/config.h>
#include <linux/syscalls.h>
#include <linux/mm.h>
#include <linux/smp_lock.h>
#include <linux/syscalls.h>
#include <linux/mm.h>
#include <linux/smp_lock.h>
+#include <linux/capability.h>
#include <linux/file.h>
#include <linux/fs.h>
#include <linux/security.h>
#include <linux/file.h>
#include <linux/fs.h>
#include <linux/security.h>