diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2008-10-21 14:42:20 -0400 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2008-10-21 14:42:20 -0400 |
| commit | b876d08f816527af257e13d89fb0d3b4b849223c (patch) | |
| tree | 40569f568230f918ca55f04b355e251747f913ed /fs/fuse/fuse_i.h | |
| parent | b364776ad1208a71f0c53578c84619a395412a8d (diff) | |
| parent | 2515ddc6db8eb49a79f0fe5e67ff09ac7c81eab4 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/pci/dmar.c
Diffstat (limited to 'fs/fuse/fuse_i.h')
| -rw-r--r-- | fs/fuse/fuse_i.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/fs/fuse/fuse_i.h b/fs/fuse/fuse_i.h index 3a876076bdd1..35accfdd747f 100644 --- a/fs/fuse/fuse_i.h +++ b/fs/fuse/fuse_i.h | |||
| @@ -6,6 +6,9 @@ | |||
| 6 | See the file COPYING. | 6 | See the file COPYING. |
| 7 | */ | 7 | */ |
| 8 | 8 | ||
| 9 | #ifndef _FS_FUSE_I_H | ||
| 10 | #define _FS_FUSE_I_H | ||
| 11 | |||
| 9 | #include <linux/fuse.h> | 12 | #include <linux/fuse.h> |
| 10 | #include <linux/fs.h> | 13 | #include <linux/fs.h> |
| 11 | #include <linux/mount.h> | 14 | #include <linux/mount.h> |
| @@ -655,3 +658,5 @@ void fuse_set_nowrite(struct inode *inode); | |||
| 655 | void fuse_release_nowrite(struct inode *inode); | 658 | void fuse_release_nowrite(struct inode *inode); |
| 656 | 659 | ||
| 657 | u64 fuse_get_attr_version(struct fuse_conn *fc); | 660 | u64 fuse_get_attr_version(struct fuse_conn *fc); |
| 661 | |||
| 662 | #endif /* _FS_FUSE_I_H */ | ||