From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Date: Wed, 2 Jun 2010 13:08:37 +0000 (+0200)
Subject: block/spectra: rename nand_release()
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=0dba333c9568b35c9278c98be6d7861a7a709ca9;p=deliverable%2Flinux.git

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

diff --git a/drivers/block/spectra/lld.c b/drivers/block/spectra/lld.c
index ac25eea1a2aa..5c3b9762dc3e 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 8c279b8a6a67..13c3ad2db394 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 c7d62c5151c7..d08388287da8 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);