From 0d20b43babd3dac3145dbfd2e12c5689896b550c Mon Sep 17 00:00:00 2001
From: Luka Perkov <luka@openwrt.org>
Date: Sun, 11 Nov 2012 20:32:15 +0100
Subject: [PATCH] --- yaml --- r: 347183 b: refs/heads/master c:
 9ff407385441744ea4618f109535014c4b651f8a h: refs/heads/master i:   347181:
 74324b28c0bfc1da8665d36ad9747b4cd67b1fb7   347179:
 d47809a8b60c130ebaa9545dc1fef6048fb231e7   347175:
 a5aba72e24c273ae3e9d20be11cb4e48d6501326   347167:
 a4acd460a4921ecd3a9b7054afc91d0fc11d54d4 v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/mtd/ar7part.c | 7 ++-----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 941b97391705..ac7d30c1968b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 22a8578fca5a47e643bb4f70c232d0ec84db9e4e
+refs/heads/master: 9ff407385441744ea4618f109535014c4b651f8a
diff --git a/trunk/drivers/mtd/ar7part.c b/trunk/drivers/mtd/ar7part.c
index 945393129952..7c057a05adb6 100644
--- a/trunk/drivers/mtd/ar7part.c
+++ b/trunk/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;