From 240de63e8857c32e6af016cd44eb32df48366809 Mon Sep 17 00:00:00 2001 From: Joe Hershberger Date: Wed, 21 Mar 2012 13:47:18 -0500 Subject: [PATCH] Xilinx: ARM: Update NAND driver to match nand_scan_ident() nand_scan_ident() has been updated to match Linux... Remove special case. Signed-off-by: Joe Hershberger --- board/xilinx/dfe/xilinx_nandpss.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/board/xilinx/dfe/xilinx_nandpss.c b/board/xilinx/dfe/xilinx_nandpss.c index 0b8fa102648..99eb9a005e3 100644 --- a/board/xilinx/dfe/xilinx_nandpss.c +++ b/board/xilinx/dfe/xilinx_nandpss.c @@ -1117,11 +1117,7 @@ int board_nand_init(struct nand_chip *nand_chip) xnandpss_init_nand_flash(xnand->smc_regs, nand_chip->options); /* first scan to find the device and get the page size */ -#ifdef LINUX_ONLY_NOT_UBOOT if (nand_scan_ident(mtd, 1, NULL)) { -#else - if (nand_scan_ident(mtd, 1)) { -#endif err = -ENXIO; dev_err(&pdev->dev, "nand_scan_ident for NAND failed\n"); goto out_unmap_all_mem; -- 2.47.3