2012-11-11 19:37:07

by Luka Perkov

[permalink] [raw]
Subject: [PATCH] MTD: use SQUASHFS_MAGIC from uapi/linux/magic.h

Signed-off-by: Luka Perkov <[email protected]>
---
drivers/mtd/ar7part.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)

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


2012-11-21 15:05:55

by Artem Bityutskiy

[permalink] [raw]
Subject: Re: [PATCH] MTD: use SQUASHFS_MAGIC from uapi/linux/magic.h

On Sun, 2012-11-11 at 20:32 +0100, Luka Perkov wrote:
> Signed-off-by: Luka Perkov <[email protected]>
> ---

Pushed to l2-mtd.git, thanks!

--
Best Regards,
Artem Bityutskiy


Attachments:
signature.asc (836.00 B)
This is a digitally signed message part