Merge branch 'x86/urgent' into x86-mm

[~andy/linux] / include / linux / magic.h

diff --git a/include/linux/magic.h b/include/linux/magic.h
index 62730ea2b56e5cea0b75ce5c90a40e87cc582682..1e5df2af8d845c6a2ff63115245c88cba4a95cdc 100644 (file)
--- a/include/linux/magic.h
+++ b/include/linux/magic.h
@@ -23,10 +23,12 @@
 #define XENFS_SUPER_MAGIC      0xabba1974
 #define EXT4_SUPER_MAGIC       0xEF53
 #define BTRFS_SUPER_MAGIC      0x9123683E
+#define NILFS_SUPER_MAGIC      0x3434
 #define HPFS_SUPER_MAGIC       0xf995e849
 #define ISOFS_SUPER_MAGIC      0x9660
 #define JFFS2_SUPER_MAGIC      0x72b6
 #define ANON_INODE_FS_MAGIC    0x09041934
+#define PSTOREFS_MAGIC         0x6165676C
 
 #define MINIX_SUPER_MAGIC      0x137F          /* original minix fs */
 #define MINIX_SUPER_MAGIC2     0x138F          /* minix fs, 30 char names */