projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'usb-4.6-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb
[deliverable/linux.git]
/
drivers
/
mtd
/
nand
/
docg4.c
diff --git
a/drivers/mtd/nand/docg4.c
b/drivers/mtd/nand/docg4.c
index df4165b02c62ebe80c554abaa538525d95db543e..d86a60e1bbcb433a380a0718d2251cd2216a8ff9 100644
(file)
--- a/
drivers/mtd/nand/docg4.c
+++ b/
drivers/mtd/nand/docg4.c
@@
-225,7
+225,6
@@
struct docg4_priv {
static struct nand_ecclayout docg4_oobinfo = {
.eccbytes = 9,
.eccpos = {7, 8, 9, 10, 11, 12, 13, 14, 15},
static struct nand_ecclayout docg4_oobinfo = {
.eccbytes = 9,
.eccpos = {7, 8, 9, 10, 11, 12, 13, 14, 15},
- .oobavail = 5,
.oobfree = { {.offset = 2, .length = 5} }
};
.oobfree = { {.offset = 2, .length = 5} }
};
@@
-1121,7
+1120,7
@@
static int docg4_block_markbad(struct mtd_info *mtd, loff_t ofs)
return ret;
}
return ret;
}
-static int docg4_block_neverbad(struct mtd_info *mtd, loff_t ofs
, int getchip
)
+static int docg4_block_neverbad(struct mtd_info *mtd, loff_t ofs)
{
/* only called when module_param ignore_badblocks is set */
return 0;
{
/* only called when module_param ignore_badblocks is set */
return 0;
This page took
0.023802 seconds
and
5
git commands to generate.