diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-19 16:34:11 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-19 16:34:11 -0500 |
commit | 4935361766cc73949fe032cd157d314f288922ba (patch) | |
tree | 1584f81525ae05a04d515b13a4787cd8eed46029 /drivers/mtd/devices | |
parent | 2874b391bd78a5b8cb84be67297a345fbdec4ac8 (diff) | |
parent | 4f65992381112acd7d2732665a9eae492c2c9de6 (diff) |
Merge git://git.infradead.org/mtd-2.6
* git://git.infradead.org/mtd-2.6: (49 commits)
[MTD] [NAND] S3C2412 fix hw ecc
[MTD] [NAND] Work around false compiler warning in CAFÉ driver
[JFFS2] printk warning fixes
[MTD] [MAPS] ichxrom warning fix
[MTD] [MAPS] amd76xrom warning fix
[MTD] [MAPS] esb2rom warning fixes
[MTD] [MAPS] ck804xrom warning fix
[MTD] [MAPS] netsc520 warning fix
[MTD] [MAPS] sc520cdp warning fix
[MTD] [ONENAND] onenand_base warning fix
[MTD] [NAND] eXcite nand flash driver
[MTD] Improve heuristic for detecting wrong-endian RedBoot partition table
[MTD] Fix RedBoot partition parsing regression harder.
[MTD] [NAND] S3C2410: Hardware ECC correction code
[JFFS2] Use MTD_OOB_AUTO to automatically place cleanmarker on NAND
[MTD] Clarify OOB-operation interface comments
[MTD] remove unused ecctype,eccsize fields from struct mtd_info
[MTD] [NOR] Intel: remove ugly PROGREGION macros
[MTD] [NOR] STAA: use writesize instead off eccsize to represent ECC block
[MTD] OneNAND: Invalidate bufferRAM after erase
...
Diffstat (limited to 'drivers/mtd/devices')
-rw-r--r-- | drivers/mtd/devices/doc2000.c | 1 | ||||
-rw-r--r-- | drivers/mtd/devices/doc2001.c | 1 | ||||
-rw-r--r-- | drivers/mtd/devices/doc2001plus.c | 1 |
3 files changed, 0 insertions, 3 deletions
diff --git a/drivers/mtd/devices/doc2000.c b/drivers/mtd/devices/doc2000.c index 603a7951ac9..8a0c4dec635 100644 --- a/drivers/mtd/devices/doc2000.c +++ b/drivers/mtd/devices/doc2000.c | |||
@@ -569,7 +569,6 @@ void DoC2k_init(struct mtd_info *mtd) | |||
569 | 569 | ||
570 | mtd->type = MTD_NANDFLASH; | 570 | mtd->type = MTD_NANDFLASH; |
571 | mtd->flags = MTD_CAP_NANDFLASH; | 571 | mtd->flags = MTD_CAP_NANDFLASH; |
572 | mtd->ecctype = MTD_ECC_RS_DiskOnChip; | ||
573 | mtd->size = 0; | 572 | mtd->size = 0; |
574 | mtd->erasesize = 0; | 573 | mtd->erasesize = 0; |
575 | mtd->writesize = 512; | 574 | mtd->writesize = 512; |
diff --git a/drivers/mtd/devices/doc2001.c b/drivers/mtd/devices/doc2001.c index fe71a12c262..6f368aec5d5 100644 --- a/drivers/mtd/devices/doc2001.c +++ b/drivers/mtd/devices/doc2001.c | |||
@@ -348,7 +348,6 @@ void DoCMil_init(struct mtd_info *mtd) | |||
348 | 348 | ||
349 | mtd->type = MTD_NANDFLASH; | 349 | mtd->type = MTD_NANDFLASH; |
350 | mtd->flags = MTD_CAP_NANDFLASH; | 350 | mtd->flags = MTD_CAP_NANDFLASH; |
351 | mtd->ecctype = MTD_ECC_RS_DiskOnChip; | ||
352 | mtd->size = 0; | 351 | mtd->size = 0; |
353 | 352 | ||
354 | /* FIXME: erase size is not always 8KiB */ | 353 | /* FIXME: erase size is not always 8KiB */ |
diff --git a/drivers/mtd/devices/doc2001plus.c b/drivers/mtd/devices/doc2001plus.c index ba4db686285..88ba82df0fb 100644 --- a/drivers/mtd/devices/doc2001plus.c +++ b/drivers/mtd/devices/doc2001plus.c | |||
@@ -472,7 +472,6 @@ void DoCMilPlus_init(struct mtd_info *mtd) | |||
472 | 472 | ||
473 | mtd->type = MTD_NANDFLASH; | 473 | mtd->type = MTD_NANDFLASH; |
474 | mtd->flags = MTD_CAP_NANDFLASH; | 474 | mtd->flags = MTD_CAP_NANDFLASH; |
475 | mtd->ecctype = MTD_ECC_RS_DiskOnChip; | ||
476 | mtd->size = 0; | 475 | mtd->size = 0; |
477 | 476 | ||
478 | mtd->erasesize = 0; | 477 | mtd->erasesize = 0; |