From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 20 Feb 2013 02:20:50 +0000 (+1100)
Subject: Merge remote-tracking branch 'l2-mtd/master'
X-Git-Tag: next-20130220~66
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=efb2ae71c2525f4e10e2d85685aefb3557a44be9;p=karo-tx-linux.git

Merge remote-tracking branch 'l2-mtd/master'
---

efb2ae71c2525f4e10e2d85685aefb3557a44be9
diff --cc drivers/mtd/nand/bcm47xxnflash/ops_bcm4706.c
index 595de4012e71,37d5b8956694..b2ab373c9eef
--- a/drivers/mtd/nand/bcm47xxnflash/ops_bcm4706.c
+++ b/drivers/mtd/nand/bcm47xxnflash/ops_bcm4706.c
@@@ -14,11 -16,9 +16,9 @@@
  #include <linux/slab.h>
  #include <linux/bcma/bcma.h>
  
- #include "bcm47xxnflash.h"
- 
  /* Broadcom uses 1'000'000 but it seems to be too many. Tests on WNDR4500 has
 - * shown 164 retries as maxiumum. */
 -#define NFLASH_READY_RETRIES		1000
 + * shown ~1000 retries as maxiumum. */
 +#define NFLASH_READY_RETRIES		10000
  
  #define NFLASH_SECTOR_SIZE		512