mtd: use SQUASHFS_MAGIC from uapi/linux/magic.h

Signed-off-by: Luka Perkov <luka@openwrt.org> Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>

mtd: use SQUASHFS_MAGIC from uapi/linux/magic.h
Signed-off-by: Luka Perkov <luka@openwrt.org> Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Luka Perkov · Artem Bityutskiy
1 parent 22a8578fca
Showing 1 changed file with 2 additions and 5 deletions Side-by-side Diff
drivers/mtd/ar7part.c
@@ -26,18 +26,15 @@
 #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;
...	...	@@ -26,18 +26,15 @@
26	26	#include <linux/mtd/mtd.h>
27	27	#include <linux/mtd/partitions.h>
28	28	#include <linux/bootmem.h>
29		-#include <linux/magic.h>
30	29	#include <linux/module.h>
31	30
	31	+#include <uapi/linux/magic.h>
	32	+
32	33	#define AR7_PARTS 4
33	34	#define ROOT_OFFSET 0xe0000
34	35
35	36	#define LOADER_MAGIC1 le32_to_cpu(0xfeedfa42)
36	37	#define LOADER_MAGIC2 le32_to_cpu(0xfeed1281)
37		-
38		-#ifndef SQUASHFS_MAGIC
39		-#define SQUASHFS_MAGIC 0x73717368
40		-#endif
41	38
42	39	struct ar7_bin_rec {
43	40	unsigned int checksum;