Merge /pub/scm/linux/kernel/git/torvalds/linux-2.6

[linux-2.6-block.git] / include / linux / magic.h

diff --git a/include/linux/magic.h b/include/linux/magic.h
index a9c6567fe70c02fa3493915c01da90738bbb3abb..9d713c03e3da681664b31fb55e0ecb82df5cc072 100644 (file)
--- a/include/linux/magic.h
+++ b/include/linux/magic.h
@@ -14,6 +14,7 @@
 #define ISOFS_SUPER_MAGIC      0x9660
 #define JFFS2_SUPER_MAGIC      0x72b6
 #define KVMFS_SUPER_MAGIC      0x19700426
+#define ANON_INODE_FS_MAGIC    0x09041934
 
 #define MINIX_SUPER_MAGIC      0x137F          /* original minix fs */
 #define MINIX_SUPER_MAGIC2     0x138F          /* minix fs, 30 char names */