diff options
| author | James Morris <jmorris@namei.org> | 2008-11-06 07:12:34 +0800 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2008-11-06 07:12:34 +0800 |
| commit | e21e696edb498c7f7eed42ba3096f6bbe13927b6 (patch) | |
| tree | 73b0bc28e45b0268f05c4b384a17bfb2140a73bc /security/inode.c | |
| parent | 2f99db28af90957271a6448479c3e492ccf7c697 (diff) | |
| parent | 75fa67706cce5272bcfc51ed646f2da21f3bdb6e (diff) | |
| download | kernel_samsung_smdk4412-e21e696edb498c7f7eed42ba3096f6bbe13927b6.zip kernel_samsung_smdk4412-e21e696edb498c7f7eed42ba3096f6bbe13927b6.tar.gz kernel_samsung_smdk4412-e21e696edb498c7f7eed42ba3096f6bbe13927b6.tar.bz2 | |
Merge branch 'master' into next
Diffstat (limited to 'security/inode.c')
| -rw-r--r-- | security/inode.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/security/inode.c b/security/inode.c index ca4958e..efea5a6 100644 --- a/security/inode.c +++ b/security/inode.c @@ -20,8 +20,7 @@ #include <linux/init.h> #include <linux/namei.h> #include <linux/security.h> - -#define SECURITYFS_MAGIC 0x73636673 +#include <linux/magic.h> static struct vfsmount *mount; static int mount_count; |