diff options
author | Steve French <sfrench@us.ibm.com> | 2006-01-12 23:47:08 +0100 |
---|---|---|
committer | Steve French <sfrench@us.ibm.com> | 2006-01-12 23:47:08 +0100 |
commit | 94bc2be31a01a3055ec94176e595dfe208e92d3b (patch) | |
tree | ebfbe81c6718a6390bfa1b99c6d228237d818576 /fs/dcookies.c | |
parent | [CIFS] Allow local filesize for file that is open for write to be updated (diff) | |
parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-fixes-2.6 (diff) | |
download | linux-94bc2be31a01a3055ec94176e595dfe208e92d3b.tar.xz linux-94bc2be31a01a3055ec94176e595dfe208e92d3b.zip |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'fs/dcookies.c')
-rw-r--r-- | fs/dcookies.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/dcookies.c b/fs/dcookies.c index 02aa0ddc582a..f8274a8f83bd 100644 --- a/fs/dcookies.c +++ b/fs/dcookies.c @@ -18,6 +18,7 @@ #include <linux/slab.h> #include <linux/list.h> #include <linux/mount.h> +#include <linux/capability.h> #include <linux/dcache.h> #include <linux/mm.h> #include <linux/errno.h> |