Pull sony into release branch

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

diff --git a/include/linux/magic.h b/include/linux/magic.h
index 156c40fc664e26420f07cd6985efbc8dfa62113c..b32c8a97fcec51b3ea266b75a964df505d36f542 100644 (file)
--- a/include/linux/magic.h
+++ b/include/linux/magic.h
@@ -3,6 +3,7 @@
 
 #define ADFS_SUPER_MAGIC       0xadf5
 #define AFFS_SUPER_MAGIC       0xadff
+#define AFS_SUPER_MAGIC                0x5346414F
 #define AUTOFS_SUPER_MAGIC     0x0187
 #define CODA_SUPER_MAGIC       0x73757245
 #define EFS_SUPER_MAGIC                0x414A53
@@ -17,6 +18,7 @@
 #define MINIX_SUPER_MAGIC2     0x138F          /* minix fs, 30 char names */
 #define MINIX2_SUPER_MAGIC     0x2468          /* minix V2 fs */
 #define MINIX2_SUPER_MAGIC2    0x2478          /* minix V2 fs, 30 char names */
+#define MINIX3_SUPER_MAGIC     0x4d5a          /* minix V3 fs */
 
 #define MSDOS_SUPER_MAGIC      0x4d44          /* MD */
 #define NCP_SUPER_MAGIC                0x564c          /* Guess, what 0x564c is :-) */