From: Pekka Enberg <penberg@cs.helsinki.fi>

Move REVOKEFS_MAGIC to <linux/magic.h> where it belongs.

Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 fs/revoke.c                  |    1 +
 include/linux/magic.h        |    1 +
 include/linux/revoked_fs_i.h |    2 --
 3 files changed, 2 insertions(+), 2 deletions(-)

diff -puN fs/revoke.c~revoke-core-code-move-magic fs/revoke.c
--- a/fs/revoke.c~revoke-core-code-move-magic
+++ a/fs/revoke.c
@@ -9,6 +9,7 @@
 #include <linux/file.h>
 #include <linux/fs.h>
 #include <linux/namei.h>
+#include <linux/magic.h>
 #include <linux/mm.h>
 #include <linux/mman.h>
 #include <linux/module.h>
diff -puN include/linux/magic.h~revoke-core-code-move-magic include/linux/magic.h
--- a/include/linux/magic.h~revoke-core-code-move-magic
+++ a/include/linux/magic.h
@@ -34,6 +34,7 @@
 #define REISERFS_SUPER_MAGIC_STRING	"ReIsErFs"
 #define REISER2FS_SUPER_MAGIC_STRING	"ReIsEr2Fs"
 #define REISER2FS_JR_SUPER_MAGIC_STRING	"ReIsEr3Fs"
+#define REVOKEFS_MAGIC		0x5245564B      /* REVK */
 
 #define UNIONFS_SUPER_MAGIC 0xf15f083d
 
diff -puN include/linux/revoked_fs_i.h~revoke-core-code-move-magic include/linux/revoked_fs_i.h
--- a/include/linux/revoked_fs_i.h~revoke-core-code-move-magic
+++ a/include/linux/revoked_fs_i.h
@@ -1,8 +1,6 @@
 #ifndef _LINUX_REVOKED_FS_I_H
 #define _LINUX_REVOKED_FS_I_H
 
-#define REVOKEFS_MAGIC 0x5245564B      /* REVK */
-
 struct revokefs_inode_info {
 	struct task_struct *owner;
 	struct file *file;
_