Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 8688b8635266cf98f00c6b0350ea2dbe7c42c321

Authored by Mike Frysinger
Committed by Al Viro
1 parent f95022161d
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

linux/magic.h: move cramfs magic out of cramfs_fs.h 

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
CC: Alexander Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

Showing 2 changed files with 3 additions and 2 deletions Side-by-side Diff

include/linux/cramfs_fs.h
Diff comments   View file @ 8688b86
... ... @@ -2,9 +2,8 @@
2 2 #define __CRAMFS_H
3 3  
4 4 #include <linux/types.h>
  5 +#include <linux/magic.h>
5 6  
6   -#define CRAMFS_MAGIC 0x28cd3d45 /* some random number */
7   -#define CRAMFS_MAGIC_WEND 0x453dcd28 /* magic number with the wrong endianess */
8 7 #define CRAMFS_SIGNATURE "Compressed ROMFS"
9 8  
10 9 /*
include/linux/magic.h
Diff comments   View file @ 8688b86
... ... @@ -6,6 +6,8 @@
6 6 #define AFS_SUPER_MAGIC 0x5346414F
7 7 #define AUTOFS_SUPER_MAGIC 0x0187
8 8 #define CODA_SUPER_MAGIC 0x73757245
  9 +#define CRAMFS_MAGIC 0x28cd3d45 /* some random number */
  10 +#define CRAMFS_MAGIC_WEND 0x453dcd28 /* magic number with the wrong endianess */
9 11 #define DEBUGFS_MAGIC 0x64626720
10 12 #define SYSFS_MAGIC 0x62656572
11 13 #define SECURITYFS_MAGIC 0x73636673