---

yaml --- r: 147859 b: refs/heads/master c: 8688b86 h: refs/heads/master i: 147857: 112885a 147855: 3213b31 v: v3
git-mirror · Jun 12, 2009 · 747c6bf · 747c6bf
1 parent 6f33467
commit 747c6bf
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f95022161d23ee661a48af8f280472209f513a67
+refs/heads/master: 8688b8635266cf98f00c6b0350ea2dbe7c42c321
diff --git a/trunk/include/linux/cramfs_fs.h b/trunk/include/linux/cramfs_fs.h
@@ -2,9 +2,8 @@
 #define __CRAMFS_H
 
 #include <linux/types.h>
+#include <linux/magic.h>
 
-#define CRAMFS_MAGIC		0x28cd3d45	/* some random number */
-#define CRAMFS_MAGIC_WEND	0x453dcd28	/* magic number with the wrong endianess */
 #define CRAMFS_SIGNATURE	"Compressed ROMFS"
 
 /*

diff --git a/trunk/include/linux/magic.h b/trunk/include/linux/magic.h
@@ -6,6 +6,8 @@
 #define AFS_SUPER_MAGIC                0x5346414F
 #define AUTOFS_SUPER_MAGIC	0x0187
 #define CODA_SUPER_MAGIC	0x73757245
+#define CRAMFS_MAGIC		0x28cd3d45	/* some random number */
+#define CRAMFS_MAGIC_WEND	0x453dcd28	/* magic number with the wrong endianess */
 #define DEBUGFS_MAGIC          0x64626720
 #define SYSFS_MAGIC		0x62656572
 #define SECURITYFS_MAGIC	0x73636673