diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-24 11:13:19 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-24 11:13:19 -0400 |
| commit | e18fa700c9a31360bc8f193aa543b7ef7b39a06b (patch) | |
| tree | 1006f53177341c614d4aeb6c96e2e8f3859b5f52 /include/linux/jffs2.h | |
| parent | 4f5537de7c1531398e84e18a24f667e49cc94208 (diff) | |
Move several *_SUPER_MAGIC symbols to include/linux/magic.h.
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'include/linux/jffs2.h')
| -rw-r--r-- | include/linux/jffs2.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/jffs2.h b/include/linux/jffs2.h index c9c760700bc3..840631fa5ff1 100644 --- a/include/linux/jffs2.h +++ b/include/linux/jffs2.h | |||
| @@ -15,12 +15,12 @@ | |||
| 15 | #ifndef __LINUX_JFFS2_H__ | 15 | #ifndef __LINUX_JFFS2_H__ |
| 16 | #define __LINUX_JFFS2_H__ | 16 | #define __LINUX_JFFS2_H__ |
| 17 | 17 | ||
| 18 | #include <linux/magic.h> | ||
| 19 | |||
| 18 | /* You must include something which defines the C99 uintXX_t types. | 20 | /* You must include something which defines the C99 uintXX_t types. |
| 19 | We don't do it from here because this file is used in too many | 21 | We don't do it from here because this file is used in too many |
| 20 | different environments. */ | 22 | different environments. */ |
| 21 | 23 | ||
| 22 | #define JFFS2_SUPER_MAGIC 0x72b6 | ||
| 23 | |||
| 24 | /* Values we may expect to find in the 'magic' field */ | 24 | /* Values we may expect to find in the 'magic' field */ |
| 25 | #define JFFS2_OLD_MAGIC_BITMASK 0x1984 | 25 | #define JFFS2_OLD_MAGIC_BITMASK 0x1984 |
| 26 | #define JFFS2_MAGIC_BITMASK 0x1985 | 26 | #define JFFS2_MAGIC_BITMASK 0x1985 |