summaryrefslogtreecommitdiff
path: root/include/linux/magic.h
diff options
context:
space:
mode:
authorKumar Gala <galak@kernel.crashing.org>2007-02-12 23:52:26 -0600
committerKumar Gala <galak@kernel.crashing.org>2007-02-12 23:52:26 -0600
commit7baca6ad0ef09c8a78d798c93a3ce25336e8f50f (patch)
treef3dd43243be6e840dc2b0386e91c4146a4f51620 /include/linux/magic.h
parent06d8bf64ba25db42fcc60d2da2268ac22af94e77 (diff)
parent17e0e27020d028a790d97699aff85a43af5be472 (diff)
Merge branch 'master' into for_paulus
Diffstat (limited to 'include/linux/magic.h')
-rw-r--r--include/linux/magic.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/magic.h b/include/linux/magic.h
index b78bbf42135a..b32c8a97fcec 100644
--- a/include/linux/magic.h
+++ b/include/linux/magic.h
@@ -18,6 +18,7 @@
#define MINIX_SUPER_MAGIC2 0x138F /* minix fs, 30 char names */
#define MINIX2_SUPER_MAGIC 0x2468 /* minix V2 fs */
#define MINIX2_SUPER_MAGIC2 0x2478 /* minix V2 fs, 30 char names */
+#define MINIX3_SUPER_MAGIC 0x4d5a /* minix V3 fs */
#define MSDOS_SUPER_MAGIC 0x4d44 /* MD */
#define NCP_SUPER_MAGIC 0x564c /* Guess, what 0x564c is :-) */