Pull altix into release branch

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

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