diff options
| author | Sebastian Andrzej Siewior <bigeasy@linutronix.de> | 2010-06-02 15:08:37 +0200 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2010-06-07 16:24:12 +0100 |
| commit | 0dba333c9568b35c9278c98be6d7861a7a709ca9 (patch) | |
| tree | f3378519a047cb1ba777b7534bc4ebcdfe4fc63c | |
| parent | b589aece500c16fdcfff74346efc0d4caf7ba968 (diff) | |
block/spectra: rename nand_release()
so it does not clash with nand_release() in mtd
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
| -rw-r--r-- | drivers/block/spectra/lld.c | 2 | ||||
| -rw-r--r-- | drivers/block/spectra/lld_nand.c | 2 | ||||
| -rw-r--r-- | drivers/block/spectra/lld_nand.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/block/spectra/lld.c b/drivers/block/spectra/lld.c index ac25eea1a2a..5c3b9762dc3 100644 --- a/drivers/block/spectra/lld.c +++ b/drivers/block/spectra/lld.c @@ -218,7 +218,7 @@ u16 GLOB_LLD_Flash_Init(void) int GLOB_LLD_Flash_Release(void) { - return nand_release(); + return nand_release_spectra(); } u16 GLOB_LLD_Erase_Block(u32 block_add) diff --git a/drivers/block/spectra/lld_nand.c b/drivers/block/spectra/lld_nand.c index 8c279b8a6a6..13c3ad2db39 100644 --- a/drivers/block/spectra/lld_nand.c +++ b/drivers/block/spectra/lld_nand.c @@ -2588,7 +2588,7 @@ int NAND_Flash_Init(void) } /* Free memory */ -int nand_release(void) +int nand_release_spectra(void) { pci_unregister_driver(&nand_pci_driver); iounmap(FlashMem); diff --git a/drivers/block/spectra/lld_nand.h b/drivers/block/spectra/lld_nand.h index c7d62c5151c..d08388287da 100644 --- a/drivers/block/spectra/lld_nand.h +++ b/drivers/block/spectra/lld_nand.h @@ -82,7 +82,7 @@ struct mrst_nand_info { }; int NAND_Flash_Init(void); -int nand_release(void); +int nand_release_spectra(void); u16 NAND_Flash_Reset(void); u16 NAND_Read_Device_ID(void); u16 NAND_Erase_Block(u32 flash_add); |