diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2006-09-27 14:57:54 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-09-27 14:57:54 -0400 |
| commit | 2dc94310bd94d0906febea7d0f7c188da620c952 (patch) | |
| tree | 6de4096f1887e2c00966177354b1c378e59bd632 /include/linux/ext2_fs.h | |
| parent | c06015148fa9a3cc452ec7121b8c3f59f4a7d6ac (diff) | |
| parent | fb60cf4ab52f3520c2119aa42f7d4ed8e7594eb6 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/tmlind/linux-omap-upstream into devel
Diffstat (limited to 'include/linux/ext2_fs.h')
| -rw-r--r-- | include/linux/ext2_fs.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/include/linux/ext2_fs.h b/include/linux/ext2_fs.h index facf34e98954..33a1aa107329 100644 --- a/include/linux/ext2_fs.h +++ b/include/linux/ext2_fs.h | |||
| @@ -17,6 +17,7 @@ | |||
| 17 | #define _LINUX_EXT2_FS_H | 17 | #define _LINUX_EXT2_FS_H |
| 18 | 18 | ||
| 19 | #include <linux/types.h> | 19 | #include <linux/types.h> |
| 20 | #include <linux/magic.h> | ||
| 20 | 21 | ||
| 21 | /* | 22 | /* |
| 22 | * The second extended filesystem constants/structures | 23 | * The second extended filesystem constants/structures |
| @@ -63,11 +64,6 @@ | |||
| 63 | /* First non-reserved inode for old ext2 filesystems */ | 64 | /* First non-reserved inode for old ext2 filesystems */ |
| 64 | #define EXT2_GOOD_OLD_FIRST_INO 11 | 65 | #define EXT2_GOOD_OLD_FIRST_INO 11 |
| 65 | 66 | ||
| 66 | /* | ||
| 67 | * The second extended file system magic number | ||
| 68 | */ | ||
| 69 | #define EXT2_SUPER_MAGIC 0xEF53 | ||
| 70 | |||
| 71 | #ifdef __KERNEL__ | 67 | #ifdef __KERNEL__ |
| 72 | #include <linux/ext2_fs_sb.h> | 68 | #include <linux/ext2_fs_sb.h> |
| 73 | static inline struct ext2_sb_info *EXT2_SB(struct super_block *sb) | 69 | static inline struct ext2_sb_info *EXT2_SB(struct super_block *sb) |