From: David Woodhouse Date: Thu, 20 May 2010 09:04:23 +0000 (+0100) Subject: mtd: mxc_nand: Remove duplicate NAND_CMD_RESET case value X-Git-Tag: v2.6.35-rc1~465^2~2 X-Git-Url: http://bbs.cooldavid.org/git/?a=commitdiff_plain;h=73850975e9a070abeed5912a24975d531fd5074c;p=net-next-2.6.git mtd: mxc_nand: Remove duplicate NAND_CMD_RESET case value This reverts commit 66803762 ("mtd: mxc_nand: add RESET command support"). Support for NAND_CMD_RESET was added separately in commit d4840180 ("mtd: mxc_nand: set NFC registers after reset"), causing a build error: drivers/mtd/nand/mxc_nand.c: In function 'mxc_nand_command': drivers/mtd/nand/mxc_nand.c:689: error: duplicate case value drivers/mtd/nand/mxc_nand.c:606: error: previously used here Signed-off-by: David Woodhouse --- diff --git a/drivers/mtd/nand/mxc_nand.c b/drivers/mtd/nand/mxc_nand.c index 35da3dc4bd1..82e94389824 100644 --- a/drivers/mtd/nand/mxc_nand.c +++ b/drivers/mtd/nand/mxc_nand.c @@ -686,7 +686,6 @@ static void mxc_nand_command(struct mtd_info *mtd, unsigned command, case NAND_CMD_ERASE1: case NAND_CMD_ERASE2: - case NAND_CMD_RESET: send_cmd(host, command, false); mxc_do_addr_cycle(mtd, column, page_addr);