hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Sebastian Andrzej Siewior 2010-06-02 15:08:37 +02:00 committed by David Woodhouse
parent b589aece50
commit 0dba333c95
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/block/spectra/lld.c
View File

@ -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)

2
drivers/block/spectra/lld_nand.c
View File

@ -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);

2
drivers/block/spectra/lld_nand.h
View File

@ -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);