ramips: bump to v4.9

[openwrt/openwrt.git] / target / linux / ramips / patches-4.4 / 0400-mtd-mtdsplit-add-support-for-custom-trx-magic-for-Buffalo-WCR-1166DS.patch

diff --git a/target/linux/ramips/patches-4.4/0400-mtd-mtdsplit-add-support-for-custom-trx-magic-for-Buffalo-WCR-1166DS.patch b/target/linux/ramips/patches-4.4/0400-mtd-mtdsplit-add-support-for-custom-trx-magic-for-Buffalo-WCR-1166DS.patch
deleted file mode 100644 (file)
index 1af72f9..0000000
--- a/target/linux/ramips/patches-4.4/0400-mtd-mtdsplit-add-support-for-custom-trx-magic-for-Buffalo-WCR-1166DS.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- a/drivers/mtd/mtdsplit/mtdsplit_trx.c
-+++ b/drivers/mtd/mtdsplit/mtdsplit_trx.c
-@@ -13,6 +13,7 @@
- #include <linux/module.h>
- #include <linux/init.h>
- #include <linux/kernel.h>
-+#include <linux/of.h>
- #include <linux/slab.h>
- #include <linux/mtd/mtd.h>
- #include <linux/mtd/partitions.h>
-@@ -20,7 +21,8 @@
- 
- #include "mtdsplit.h"
- 
--#define TRX_MAGIC   0x30524448  /* "HDR0" */
-+#define TRX_MAGIC             0x30524448  /* "HDR0" */
-+#define TRX_MAGIC_BUFFALO     0x746f435c
- 
- struct trx_header {
-       __le32 magic;
-@@ -82,7 +84,8 @@ mtdsplit_parse_trx(struct mtd_info *mast
-               if (ret)
-                       continue;
- 
--              if (hdr.magic != cpu_to_le32(TRX_MAGIC)) {
-+              if (hdr.magic != cpu_to_le32(TRX_MAGIC) &&
-+                  !(of_machine_is_compatible("buffalo,wcr-1166ds") && hdr.magic == cpu_to_le32(TRX_MAGIC_BUFFALO))) {
-                       pr_debug("no valid trx header found in \"%s\" at offset %llx\n",
-                                master->name, (unsigned long long) offset);
-                       continue;