diff options
| author | Scott Wood <oss@buserror.net> | 2016-05-30 13:57:58 -0500 |
|---|---|---|
| committer | Scott Wood <oss@buserror.net> | 2016-06-03 20:27:48 -0500 |
| commit | ceee07b65875bb01bef55cba06940ef7afc1afba (patch) | |
| tree | 114c79852874d1970e91ff76f80835ce25038baa /drivers/mtd/nand/mxs_nand.c | |
| parent | 81c772521ff26054a3fe75efa87d8daeae83e9b4 (diff) | |
| download | talos-obmc-uboot-ceee07b65875bb01bef55cba06940ef7afc1afba.tar.gz talos-obmc-uboot-ceee07b65875bb01bef55cba06940ef7afc1afba.zip | |
mtd: nand: Sync with Linux v4.6
Updates the NAND code to match Linux v4.6. The previous sync was from
Linux v4.1 in commit d3963721d93fafa.
Note that none of the individual NAND drivers tracked Linux closely
enough to be synced themselves, other than manually applying a few
cross-tree changes.
Signed-off-by: Scott Wood <oss@buserror.net>
Tested-by: Heiko Schocher <hs@denx.de>
Diffstat (limited to 'drivers/mtd/nand/mxs_nand.c')
| -rw-r--r-- | drivers/mtd/nand/mxs_nand.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mtd/nand/mxs_nand.c b/drivers/mtd/nand/mxs_nand.c index 5291330b91..7be1f86bc2 100644 --- a/drivers/mtd/nand/mxs_nand.c +++ b/drivers/mtd/nand/mxs_nand.c @@ -961,7 +961,7 @@ static int mxs_nand_ecc_write_oob(struct mtd_info *mtd, struct nand_chip *nand, * Thus, this function is only called when we want *all* blocks to look good, * so it *always* return success. */ -static int mxs_nand_block_bad(struct mtd_info *mtd, loff_t ofs, int getchip) +static int mxs_nand_block_bad(struct mtd_info *mtd, loff_t ofs) { return 0; } |
