diff options
author | Anton Altaparmakov <aia21@cantab.net> | 2005-07-04 09:14:42 -0400 |
---|---|---|
committer | Anton Altaparmakov <aia21@cantab.net> | 2005-07-04 09:14:42 -0400 |
commit | 07929dcb963786512c760dd3ecd148d89295e7e5 (patch) | |
tree | f5db01392ebb968b4c8acb5a6b3b03a833bfcb02 /fs/freevxfs/vxfs_subr.c | |
parent | c2d9b8387bce8b4a0fd402fab7dc1319d11a418d (diff) | |
parent | 19f7241a3b087bbf4dd107c979608fdb56c83a09 (diff) |
Automatic merge with /usr/src/ntfs-2.6.git.
Diffstat (limited to 'fs/freevxfs/vxfs_subr.c')
-rw-r--r-- | fs/freevxfs/vxfs_subr.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/freevxfs/vxfs_subr.c b/fs/freevxfs/vxfs_subr.c index 5e305612054a..50aae77651b2 100644 --- a/fs/freevxfs/vxfs_subr.c +++ b/fs/freevxfs/vxfs_subr.c | |||
@@ -36,7 +36,6 @@ | |||
36 | #include <linux/slab.h> | 36 | #include <linux/slab.h> |
37 | #include <linux/pagemap.h> | 37 | #include <linux/pagemap.h> |
38 | 38 | ||
39 | #include "vxfs_kcompat.h" | ||
40 | #include "vxfs_extern.h" | 39 | #include "vxfs_extern.h" |
41 | 40 | ||
42 | 41 | ||