* [PATCH] MTD: use SQUASHFS_MAGIC from uapi/linux/magic.h
@ 2012-11-11 19:32 Luka Perkov
2012-11-21 15:06 ` Artem Bityutskiy
0 siblings, 1 reply; 2+ messages in thread
From: Luka Perkov @ 2012-11-11 19:32 UTC (permalink / raw)
To: David Woodhouse; +Cc: linux-mtd, linux-kernel, Luka Perkov
Signed-off-by: Luka Perkov <luka@openwrt.org>
---
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] MTD: use SQUASHFS_MAGIC from uapi/linux/magic.h
2012-11-11 19:32 [PATCH] MTD: use SQUASHFS_MAGIC from uapi/linux/magic.h Luka Perkov
@ 2012-11-21 15:06 ` Artem Bityutskiy
0 siblings, 0 replies; 2+ messages in thread
From: Artem Bityutskiy @ 2012-11-21 15:06 UTC (permalink / raw)
To: Luka Perkov; +Cc: David Woodhouse, linux-mtd, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 184 bytes --]
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!
--
Best Regards,
Artem Bityutskiy
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-11-21 15:05 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-11-11 19:32 [PATCH] MTD: use SQUASHFS_MAGIC from uapi/linux/magic.h Luka Perkov
2012-11-21 15:06 ` Artem Bityutskiy
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).