aboutsummaryrefslogtreecommitdiff
path: root/include/uapi/linux
diff options
context:
space:
mode:
Diffstat (limited to 'include/uapi/linux')
-rw-r--r--include/uapi/linux/magic.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/uapi/linux/magic.h b/include/uapi/linux/magic.h
index 2944278a8ba7..77c60311a6c6 100644
--- a/include/uapi/linux/magic.h
+++ b/include/uapi/linux/magic.h
@@ -71,6 +71,6 @@
#define USBDEVICE_SUPER_MAGIC 0x9fa2
#define MTD_INODE_FS_MAGIC 0x11307854
#define ANON_INODE_FS_MAGIC 0x09041934
-
+#define BTRFS_TEST_MAGIC 0x73727279
#endif /* __LINUX_MAGIC_H__ */
rnet/intel/e1000e/80003es2lan.c?id=82b3297009b6831dfe47f0f38ed4043e39f58c9f'>82b3297009b6831dfe47f0f38ed4043e39f58c9f (diff)parent736c8b52c8ada4ca93a59f7d597c5650ebc45921 (diff)
Merge branch 'inet-const'
Eric Dumazet says: