diff options
author | Luka Perkov <luka@openwrt.org> | 2012-11-11 14:32:15 -0500 |
---|---|---|
committer | Artem Bityutskiy <artem.bityutskiy@linux.intel.com> | 2012-11-21 10:06:44 -0500 |
commit | 9ff407385441744ea4618f109535014c4b651f8a (patch) | |
tree | 1ede167804adf72fb6f151e1ba0bc26a9d25368f /drivers/mtd/ar7part.c | |
parent | 22a8578fca5a47e643bb4f70c232d0ec84db9e4e (diff) |
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>
Diffstat (limited to 'drivers/mtd/ar7part.c')
-rw-r--r-- | drivers/mtd/ar7part.c | 7 |
1 files changed, 2 insertions, 5 deletions
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 @@ | |||
26 | #include <linux/mtd/mtd.h> | 26 | #include <linux/mtd/mtd.h> |
27 | #include <linux/mtd/partitions.h> | 27 | #include <linux/mtd/partitions.h> |
28 | #include <linux/bootmem.h> | 28 | #include <linux/bootmem.h> |
29 | #include <linux/magic.h> | ||
30 | #include <linux/module.h> | 29 | #include <linux/module.h> |
31 | 30 | ||
31 | #include <uapi/linux/magic.h> | ||
32 | |||
32 | #define AR7_PARTS 4 | 33 | #define AR7_PARTS 4 |
33 | #define ROOT_OFFSET 0xe0000 | 34 | #define ROOT_OFFSET 0xe0000 |
34 | 35 | ||
35 | #define LOADER_MAGIC1 le32_to_cpu(0xfeedfa42) | 36 | #define LOADER_MAGIC1 le32_to_cpu(0xfeedfa42) |
36 | #define LOADER_MAGIC2 le32_to_cpu(0xfeed1281) | 37 | #define LOADER_MAGIC2 le32_to_cpu(0xfeed1281) |
37 | 38 | ||
38 | #ifndef SQUASHFS_MAGIC | ||
39 | #define SQUASHFS_MAGIC 0x73717368 | ||
40 | #endif | ||
41 | |||
42 | struct ar7_bin_rec { | 39 | struct ar7_bin_rec { |
43 | unsigned int checksum; | 40 | unsigned int checksum; |
44 | unsigned int length; | 41 | unsigned int length; |