Merge branch 'master' into csb1725

[mv-sheeva.git] / include / linux / magic.h

diff --git a/include/linux/magic.h b/include/linux/magic.h
index eb9800f05782413f640a0b3fcf68dbf1aa5ca7fa..ff690d05f129c5af1f51b740c975f6a014d55221 100644 (file)
--- a/include/linux/magic.h
+++ b/include/linux/magic.h
@@ -57,5 +57,6 @@
 
 #define DEVPTS_SUPER_MAGIC     0x1cd1
 #define SOCKFS_MAGIC           0x534F434B
+#define V9FS_MAGIC             0x01021997
 
 #endif /* __LINUX_MAGIC_H__ */