From: Michal Simek <michal.simek@xilinx.com>
Date: Mon, 6 May 2013 15:14:43 +0000 (+0200)
Subject: nand: Remove ancient nand hack
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bae5bdc3fc70fe0badc812e90bb8c2f4f846e56f;p=thirdparty%2Fu-boot.git

nand: Remove ancient nand hack

xnandps_device_ready

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---

diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c
index 280e8f211a6..a2d06be99fc 100644
--- a/drivers/mtd/nand/nand_base.c
+++ b/drivers/mtd/nand/nand_base.c
@@ -786,18 +786,13 @@ static int nand_wait(struct mtd_info *mtd, struct nand_chip *chip)
 			return 0x01;
 		}
 
-/* HACK FIXME BHILL */
-#ifndef CONFIG_ZYNQ
 		if (chip->dev_ready) {
 			if (chip->dev_ready(mtd))
 				break;
 		} else {
-#endif
 			if (chip->read_byte(mtd) & NAND_STATUS_READY)
 				break;
-#ifndef CONFIG_ZYNQ
 		}
-#endif
 	}
 #ifdef PPCHAMELON_NAND_TIMER_HACK
 	time_start = get_timer(0);