diff options
| author | Tom Rini <trini@ti.com> | 2013-05-31 18:28:47 -0400 | 
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-05-31 18:28:47 -0400 | 
| commit | d6639d10dbfa42dc888f8917012550b632a88959 (patch) | |
| tree | 3c971dcfad4d7ad58570e8d5b0318f58370f9d3d /drivers/mtd/cfi_mtd.c | |
| parent | 3da0e5750b24a9491058df6126c7be577a276c09 (diff) | |
| parent | dfe64e2c89731a3f9950d7acd8681b68df2bae03 (diff) | |
| download | olio-uboot-2014.01-d6639d10dbfa42dc888f8917012550b632a88959.tar.xz olio-uboot-2014.01-d6639d10dbfa42dc888f8917012550b632a88959.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-nand-flash
Diffstat (limited to 'drivers/mtd/cfi_mtd.c')
| -rw-r--r-- | drivers/mtd/cfi_mtd.c | 12 | 
1 files changed, 6 insertions, 6 deletions
| diff --git a/drivers/mtd/cfi_mtd.c b/drivers/mtd/cfi_mtd.c index 8d74fa941..bbb71a19e 100644 --- a/drivers/mtd/cfi_mtd.c +++ b/drivers/mtd/cfi_mtd.c @@ -244,12 +244,12 @@ int cfi_mtd_init(void)  		mtd->size		= fi->size;  		mtd->writesize		= 1; -		mtd->erase		= cfi_mtd_erase; -		mtd->read		= cfi_mtd_read; -		mtd->write		= cfi_mtd_write; -		mtd->sync		= cfi_mtd_sync; -		mtd->lock		= cfi_mtd_lock; -		mtd->unlock		= cfi_mtd_unlock; +		mtd->_erase		= cfi_mtd_erase; +		mtd->_read		= cfi_mtd_read; +		mtd->_write		= cfi_mtd_write; +		mtd->_sync		= cfi_mtd_sync; +		mtd->_lock		= cfi_mtd_lock; +		mtd->_unlock		= cfi_mtd_unlock;  		mtd->priv		= fi;  		if (add_mtd_device(mtd)) |