From: Sebastian Andrzej Siewior <bigeasy@xxxxxxxxxxxxx>
so it does not clash with nand_release() in mtd
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@xxxxxxxxxxxxx>
Signed-off-by: David Woodhouse <David.Woodhouse@xxxxxxxxx>
---
drivers/block/spectra/lld.c | 2 +-
drivers/block/spectra/lld_nand.c | 2 +-
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 ac25eea..5c3b976 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 8c279b8..13c3ad2 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 c7d62c5..d083882 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);
--
1.7.1
_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
