From 6dd0225022428c3dfac682d483796991c8fba497 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Thu, 22 Jun 2006 13:06:43 +0200 Subject: [PATCH] --- yaml --- r: 30928 b: refs/heads/master c: 1794c13002918c2216e2e11913eb299d071a5731 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/mtd/nand/ndfc.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 866e4a592a60..adad6a9994ef 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 99974c62b6acd4093b6f485132067089c39f967c +refs/heads/master: 1794c13002918c2216e2e11913eb299d071a5731 diff --git a/trunk/drivers/mtd/nand/ndfc.c b/trunk/drivers/mtd/nand/ndfc.c index fe8d38514ba6..e5bd88f2d560 100644 --- a/trunk/drivers/mtd/nand/ndfc.c +++ b/trunk/drivers/mtd/nand/ndfc.c @@ -61,15 +61,15 @@ static void ndfc_select_chip(struct mtd_info *mtd, int chip) static void ndfc_hwcontrol(struct mtd_info *mtd, int cmd, unsigned int ctrl) { - struct nand_chip *chip = mtd->priv; + struct ndfc_controller *ndfc = &ndfc_ctrl; if (cmd == NAND_CMD_NONE) return; if (ctrl & NAND_CLE) - writel(cmd & 0xFF, chip->IO_ADDR_W + NDFC_CMD); + writel(cmd & 0xFF, ndfc->ndfcbase + NDFC_CMD); else - writel(cmd & 0xFF, chip->IO_ADDR_W + NDFC_ALE); + writel(cmd & 0xFF, ndfc->ndfcbase + NDFC_ALE); } static int ndfc_ready(struct mtd_info *mtd)