---

yaml --- r: 347183 b: refs/heads/master c: 9ff4073 h: refs/heads/master i: 347181: 74324b2 347179: d47809a 347175: a5aba72 347167: a4acd46 v: v3
git-mirror · Nov 21, 2012 · 0d20b43 · 0d20b43
1 parent 20346ab
commit 0d20b43
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 22a8578fca5a47e643bb4f70c232d0ec84db9e4e
+refs/heads/master: 9ff407385441744ea4618f109535014c4b651f8a
diff --git a/trunk/drivers/mtd/ar7part.c b/trunk/drivers/mtd/ar7part.c
@@ -26,19 +26,16 @@
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
 #include <linux/bootmem.h>
-#include <linux/magic.h>
 #include <linux/module.h>
 
+#include <uapi/linux/magic.h>
+
 #define AR7_PARTS	4
 #define ROOT_OFFSET	0xe0000
 
 #define LOADER_MAGIC1	le32_to_cpu(0xfeedfa42)
 #define LOADER_MAGIC2	le32_to_cpu(0xfeed1281)
 
-#ifndef SQUASHFS_MAGIC
-#define SQUASHFS_MAGIC	0x73717368
-#endif
-
 struct ar7_bin_rec {
 	unsigned int checksum;
 	unsigned int length;