kernel: refresh patches

[openwrt/svn-archive/archive.git] / target / linux / lantiq / patches-3.14 / 0014-MTD-lantiq-xway-the-latched-command-should-be-persis.patch

diff --git a/target/linux/lantiq/patches-3.14/0014-MTD-lantiq-xway-the-latched-command-should-be-persis.patch b/target/linux/lantiq/patches-3.14/0014-MTD-lantiq-xway-the-latched-command-should-be-persis.patch
index d3c197ef7e3d6609878b0bfacdc2ea270f2a51c6..6a7785b016494f071e42d3ddf1df3a1cf8c7a644 100644 (file)
--- a/target/linux/lantiq/patches-3.14/0014-MTD-lantiq-xway-the-latched-command-should-be-persis.patch
+++ b/target/linux/lantiq/patches-3.14/0014-MTD-lantiq-xway-the-latched-command-should-be-persis.patch
@@ -9,8 +9,6 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
  drivers/mtd/nand/xway_nand.c |   12 ++++++------
  1 file changed, 6 insertions(+), 6 deletions(-)
 
-diff --git a/drivers/mtd/nand/xway_nand.c b/drivers/mtd/nand/xway_nand.c
-index 169a91d..7f2bdd1 100644
 --- a/drivers/mtd/nand/xway_nand.c
 +++ b/drivers/mtd/nand/xway_nand.c
 @@ -54,6 +54,8 @@
@@ -22,7 +20,7 @@ index 169a91d..7f2bdd1 100644
  static void xway_reset_chip(struct nand_chip *chip)
  {
        unsigned long nandaddr = (unsigned long) chip->IO_ADDR_W;
-@@ -94,17 +96,15 @@ static void xway_cmd_ctrl(struct mtd_info *mtd, int cmd, unsigned int ctrl)
+@@ -94,17 +96,15 @@ static void xway_cmd_ctrl(struct mtd_inf
        unsigned long flags;
  
        if (ctrl & NAND_CTRL_CHANGE) {
@@ -44,6 +42,3 @@ index 169a91d..7f2bdd1 100644
                while ((ltq_ebu_r32(EBU_NAND_WAIT) & NAND_WAIT_WR_C) == 0)
                        ;
                spin_unlock_irqrestore(&ebu_lock, flags);
--- 
-1.7.10.4
-