Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

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

diff --git a/include/linux/magic.h b/include/linux/magic.h
index 36cc20dfd1427398daaad3a7b2fc0faeaaa04e93..722d4755060f7deee6f403ee7a5aafed5a914c25 100644 (file)
--- a/include/linux/magic.h
+++ b/include/linux/magic.h
@@ -38,4 +38,7 @@
 #define SMB_SUPER_MAGIC                0x517B
 #define USBDEVICE_SUPER_MAGIC  0x9fa2
 
+#define FUTEXFS_SUPER_MAGIC    0xBAD1DEA
+#define INOTIFYFS_SUPER_MAGIC  0x2BAD1DEA
+
 #endif /* __LINUX_MAGIC_H__ */