Merge branch 'for-linus' of git://www.jni.nu/cris

[linux-2.6] / drivers / mtd / nand / ts7250.c

diff --git a/drivers/mtd/nand/ts7250.c b/drivers/mtd/nand/ts7250.c
index a0b4b1edcb0d10739ab6bca0f30cc85e9c62d635..f40081069ab2c6fa0f2a5705eaad7c9e698c28af 100644 (file)
--- a/drivers/mtd/nand/ts7250.c
+++ b/drivers/mtd/nand/ts7250.c
@@ -97,7 +97,7 @@ static void ts7250_hwcontrol(struct mtd_info *mtd, int cmd, unsigned int ctrl)
                unsigned long addr = TS72XX_NAND_CONTROL_VIRT_BASE;
                unsigned char bits;
 
-               bits = (ctrl & NAND_CNE) << 2;
+               bits = (ctrl & NAND_NCE) << 2;
                bits |= ctrl & NAND_CLE;
                bits |= (ctrl & NAND_ALE) >> 2;