diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-16 22:01:29 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-16 22:01:29 -0400 |
| commit | 242e5d06be2ad2633c85313a37862e03f4450a46 (patch) | |
| tree | 9a75e5efed6ee9a4f5d9769b851ab503c1fb5ef2 /include/linux/magic.h | |
| parent | 4c5811bf463b0ef82fabbd1708f8bb2d753aeb18 (diff) | |
| parent | afe997a183ecc0be72652c7a5ce2152bdf91724e (diff) | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
[IA64] tioca: Fix assignment from incompatible pointer warnings
[IA64] mca.c: Fix cast from integer to pointer warning
[IA64] setup.c Typo fix "Architechtuallly"
[IA64] Add CONFIG_MISC_DEVICES=y to configs that need it.
[IA64] disable interrupts at end of ia64_mca_cpe_int_handler()
[IA64] Add DMA_ERROR_CODE define.
pstore: fix build warning for unused return value from sysfs_create_file
pstore: X86 platform interface using ACPI/APEI/ERST
pstore: new filesystem interface to platform persistent storage
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 @@ | |||
| 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 */ |