diff options
author | Felix Blyakher <felixb@sgi.com> | 2009-03-03 09:18:47 -0600 |
---|---|---|
committer | Felix Blyakher <felixb@sgi.com> | 2009-03-03 09:18:47 -0600 |
commit | d4fc7cea5dda04ae1a6f36175ec1dd8ff088ed52 (patch) | |
tree | 3d65887b06c575a94feed1fd91216e32a62b31d8 /drivers/mtd/nand/atmel_nand.c | |
parent | 3a011a171906a3a51a43bb860fb7c66a64cab140 (diff) | |
parent | 2450cf51a1bdba7037e91b1bcc494b01c58aaf66 (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/mtd/nand/atmel_nand.c')
-rw-r--r-- | drivers/mtd/nand/atmel_nand.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/mtd/nand/atmel_nand.c b/drivers/mtd/nand/atmel_nand.c index c98c1570a40b..47a33cec3793 100644 --- a/drivers/mtd/nand/atmel_nand.c +++ b/drivers/mtd/nand/atmel_nand.c @@ -139,7 +139,8 @@ static int atmel_nand_device_ready(struct mtd_info *mtd) struct nand_chip *nand_chip = mtd->priv; struct atmel_nand_host *host = nand_chip->priv; - return gpio_get_value(host->board->rdy_pin); + return gpio_get_value(host->board->rdy_pin) ^ + !!host->board->rdy_pin_active_low; } /* |