From 43638c674a1bc57eef41439e87c281269a08cb16 Mon Sep 17 00:00:00 2001
From: Markus Klotzbücher <Markus Klotzbümk@pollux.denx.de>
Date: Mon, 6 Mar 2006 15:04:25 +0100
Subject: Cleanup of NAND support of delta board using the Monahans Data Flash
 Controller.

---
 drivers/nand/nand_base.c | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

(limited to 'drivers')

diff --git a/drivers/nand/nand_base.c b/drivers/nand/nand_base.c
index a5792cfb52..d6c84fb533 100644
--- a/drivers/nand/nand_base.c
+++ b/drivers/nand/nand_base.c
@@ -489,7 +489,6 @@ static int nand_default_block_markbad(struct mtd_info *mtd, loff_t ofs)
 	return nand_write_oob (mtd, ofs , 2, &retlen, buf);
 }
 
-#if READ_STATUS_BUG
 /**
  * nand_check_wp - [GENERIC] check if the chip is write protected
  * @mtd:	MTD device structure
@@ -504,12 +503,7 @@ static int nand_check_wp (struct mtd_info *mtd)
 	this->cmdfunc (mtd, NAND_CMD_STATUS, -1, -1);
 	return (this->read_byte(mtd) & 0x80) ? 0 : 1;
 }
-#else
-static int nand_check_wp (struct mtd_info *mtd)
-{
-	return 0;
-}
-#endif
+
 /**
  * nand_block_checkbad - [GENERIC] Check if a block is marked bad
  * @mtd:	MTD device structure
-- 
cgit