From: Luka Perkov <luka@openwrt.org>
Date: Sun, 11 Nov 2012 19:32:15 +0000 (+0100)
Subject: mtd: use SQUASHFS_MAGIC from uapi/linux/magic.h
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=9ff407385441744ea4618f109535014c4b651f8a;p=deliverable%2Flinux.git

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>
---

diff --git a/drivers/mtd/ar7part.c b/drivers/mtd/ar7part.c
index 945393129952..7c057a05adb6 100644
--- a/drivers/mtd/ar7part.c
+++ b/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;