diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-12-09 11:34:48 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-12-09 11:34:48 +1100 |
| commit | 2a9038ec7d2f497207414296edd4c448f30c7564 (patch) | |
| tree | cf98d8329c9c4e273a72a43ec3958866ee61c2fa /include | |
| parent | be5d6de518bb6a1d79ba9b5bb778a8c64d522848 (diff) | |
| parent | 66a595a5c4a0f7a4ea78fbeddfe4002c036b96f1 (diff) | |
Merge remote branch 'ecryptfs/next'
Diffstat (limited to 'include')
| -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 ff690d05f129..62730ea2b56e 100644 --- a/include/linux/magic.h +++ b/include/linux/magic.h @@ -16,6 +16,7 @@ #define TMPFS_MAGIC 0x01021994 #define HUGETLBFS_MAGIC 0x958458f6 /* some random number */ #define SQUASHFS_MAGIC 0x73717368 +#define ECRYPTFS_SUPER_MAGIC 0xf15f #define EFS_SUPER_MAGIC 0x414A53 #define EXT2_SUPER_MAGIC 0xEF53 #define EXT3_SUPER_MAGIC 0xEF53 |