diff options
| author |   Tony Luck <tony.luck@intel.com> | 2011-03-16 09:58:31 -0700 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2011-03-16 09:58:31 -0700 |
| commit | afe997a183ecc0be72652c7a5ce2152bdf91724e (patch) | |
| tree | 307ec69f546700d1aac7a9bc23853f6e4ae875a0 /include/linux/magic.h | |
| parent | Pull misc-2.6.39 into release branch (diff) | |
| parent | pstore: fix build warning for unused return value from sysfs_create_file (diff) | |
| download | linux-dev-afe997a183ecc0be72652c7a5ce2152bdf91724e.tar.xz linux-dev-afe997a183ecc0be72652c7a5ce2152bdf91724e.zip | |
Pull pstorev4 into release branch
Diffstat (limited to 'include/linux/magic.h')
| -rw-r--r-- | include/linux/magic.h | 1 |
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 @@ #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 */ |