diff options
| author | Steve French <sfrench@us.ibm.com> | 2008-02-15 22:06:08 +0100 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2008-02-15 22:06:08 +0100 |
| commit | 0a3abcf75bf391fec4e32356ab5ddb8f5d2e6b41 (patch) | |
| tree | b80b1d344ec24cad28b057ef803cebac9434be01 /fs/ufs/balloc.c | |
| parent | [CIFS] factoring out common code in get_inode_info functions (diff) | |
| parent | Linux 2.6.25-rc2 (diff) | |
| download | linux-0a3abcf75bf391fec4e32356ab5ddb8f5d2e6b41.tar.xz linux-0a3abcf75bf391fec4e32356ab5ddb8f5d2e6b41.zip | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'fs/ufs/balloc.c')
| -rw-r--r-- | fs/ufs/balloc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ufs/balloc.c b/fs/ufs/balloc.c index f63a09ce8683..1fca381f0ce2 100644 --- a/fs/ufs/balloc.c +++ b/fs/ufs/balloc.c @@ -9,7 +9,6 @@ */ #include <linux/fs.h> -#include <linux/ufs_fs.h> #include <linux/stat.h> #include <linux/time.h> #include <linux/string.h> @@ -19,6 +18,7 @@ #include <linux/bitops.h> #include <asm/byteorder.h> +#include "ufs_fs.h" #include "ufs.h" #include "swab.h" #include "util.h" |