diff options
author | Steve French <sfrench@us.ibm.com> | 2008-02-15 16:06:08 -0500 |
---|---|---|
committer | Steve French <sfrench@us.ibm.com> | 2008-02-15 16:06:08 -0500 |
commit | 0a3abcf75bf391fec4e32356ab5ddb8f5d2e6b41 (patch) | |
tree | b80b1d344ec24cad28b057ef803cebac9434be01 /fs/ufs/util.c | |
parent | 70eff55d2d979cca700aa6906494f0c474f3f7ff (diff) | |
parent | 101142c37be8e5af9b847860219217e6b958c739 (diff) |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'fs/ufs/util.c')
-rw-r--r-- | fs/ufs/util.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ufs/util.c b/fs/ufs/util.c index 410084dae389..85a7fc9e4a4e 100644 --- a/fs/ufs/util.c +++ b/fs/ufs/util.c | |||
@@ -8,9 +8,9 @@ | |||
8 | 8 | ||
9 | #include <linux/string.h> | 9 | #include <linux/string.h> |
10 | #include <linux/slab.h> | 10 | #include <linux/slab.h> |
11 | #include <linux/ufs_fs.h> | ||
12 | #include <linux/buffer_head.h> | 11 | #include <linux/buffer_head.h> |
13 | 12 | ||
13 | #include "ufs_fs.h" | ||
14 | #include "ufs.h" | 14 | #include "ufs.h" |
15 | #include "swab.h" | 15 | #include "swab.h" |
16 | #include "util.h" | 16 | #include "util.h" |