diff --git a/[refs] b/[refs] index f48090b2c07b..2dc33ca2e18c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0d4c36a9b6ab6b15851f60956d901a3c53574ea8 +refs/heads/master: a7e3108cca54c105f496919040f00df56767ec00 diff --git a/trunk/fs/ramfs/inode.c b/trunk/fs/ramfs/inode.c index a7f0110fca4c..a6090aa1a7c1 100644 --- a/trunk/fs/ramfs/inode.c +++ b/trunk/fs/ramfs/inode.c @@ -34,12 +34,10 @@ #include #include #include +#include #include #include "internal.h" -/* some random number */ -#define RAMFS_MAGIC 0x858458f6 - #define RAMFS_DEFAULT_MODE 0755 static const struct super_operations ramfs_ops; diff --git a/trunk/include/linux/magic.h b/trunk/include/linux/magic.h index bce37786a0a5..76285e01b39e 100644 --- a/trunk/include/linux/magic.h +++ b/trunk/include/linux/magic.h @@ -12,6 +12,7 @@ #define SYSFS_MAGIC 0x62656572 #define SECURITYFS_MAGIC 0x73636673 #define SELINUX_MAGIC 0xf97cff8c +#define RAMFS_MAGIC 0x858458f6 /* some random number */ #define TMPFS_MAGIC 0x01021994 #define HUGETLBFS_MAGIC 0x958458f6 /* some random number */ #define SQUASHFS_MAGIC 0x73717368