Patchwork MTD: use SQUASHFS_MAGIC from uapi/linux/magic.h

login
register
mail settings
Submitter Luka Perkov
Date Nov. 11, 2012, 7:32 p.m.
Message ID <1352662335-12028-1-git-send-email-luka@openwrt.org>
Download mbox | patch
Permalink /patch/198293/
State New
Headers show

Comments

Luka Perkov - Nov. 11, 2012, 7:32 p.m.
Signed-off-by: Luka Perkov <luka@openwrt.org>
---
 drivers/mtd/ar7part.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)
Artem Bityutskiy - Nov. 21, 2012, 3:06 p.m.
On Sun, 2012-11-11 at 20:32 +0100, Luka Perkov wrote:
> Signed-off-by: Luka Perkov <luka@openwrt.org>
> ---

Pushed to l2-mtd.git, thanks!

Patch

diff --git a/drivers/mtd/ar7part.c b/drivers/mtd/ar7part.c
index 9453931..7c057a0 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;