aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/magic.h
diff options
context:
space:
mode:
authorTony Luck <tony.luck@intel.com>2011-03-16 12:58:31 -0400
committerTony Luck <tony.luck@intel.com>2011-03-16 12:58:31 -0400
commitafe997a183ecc0be72652c7a5ce2152bdf91724e (patch)
tree307ec69f546700d1aac7a9bc23853f6e4ae875a0 /include/linux/magic.h
parent4897313a62cf0b106e9e861bf7350a9cfc0715d0 (diff)
parent168f2e14319aba3125946649604e858cbae85be6 (diff)
Pull pstorev4 into release branch
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 62730ea2b56e..6cfe344f9559 100644
--- a/include/linux/magic.h
+++ b/include/linux/magic.h
@@ -27,6 +27,7 @@
27#define ISOFS_SUPER_MAGIC 0x9660 27#define ISOFS_SUPER_MAGIC 0x9660
28#define JFFS2_SUPER_MAGIC 0x72b6 28#define JFFS2_SUPER_MAGIC 0x72b6
29#define ANON_INODE_FS_MAGIC 0x09041934 29#define ANON_INODE_FS_MAGIC 0x09041934
30#define PSTOREFS_MAGIC 0x6165676C
30 31
31#define MINIX_SUPER_MAGIC 0x137F /* original minix fs */ 32#define MINIX_SUPER_MAGIC 0x137F /* original minix fs */
32#define MINIX_SUPER_MAGIC2 0x138F /* minix fs, 30 char names */ 33#define MINIX_SUPER_MAGIC2 0x138F /* minix fs, 30 char names */