diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
| commit | 1c01a80cfec6f806246f31ff2680cd3639b30e67 (patch) | |
| tree | 0b554aad2ec1da71ecf6339d4ba51617bfe1dc3c /drivers/mtd/onenand/omap2.c | |
| parent | c44d79950b2daa1025e62eede73e4e4a274d1ef3 (diff) | |
| parent | 4a9f65f6304a00f6473e83b19c1e83caa1e42530 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/smsc911x.c
Diffstat (limited to 'drivers/mtd/onenand/omap2.c')
| -rw-r--r-- | drivers/mtd/onenand/omap2.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mtd/onenand/omap2.c b/drivers/mtd/onenand/omap2.c index f591f615d3f..1fcb41adab0 100644 --- a/drivers/mtd/onenand/omap2.c +++ b/drivers/mtd/onenand/omap2.c | |||
| @@ -608,7 +608,7 @@ static int omap2_onenand_enable(struct mtd_info *mtd) | |||
| 608 | 608 | ||
| 609 | ret = regulator_enable(c->regulator); | 609 | ret = regulator_enable(c->regulator); |
| 610 | if (ret != 0) | 610 | if (ret != 0) |
| 611 | dev_err(&c->pdev->dev, "cant enable regulator\n"); | 611 | dev_err(&c->pdev->dev, "can't enable regulator\n"); |
| 612 | 612 | ||
| 613 | return ret; | 613 | return ret; |
| 614 | } | 614 | } |
| @@ -620,7 +620,7 @@ static int omap2_onenand_disable(struct mtd_info *mtd) | |||
| 620 | 620 | ||
| 621 | ret = regulator_disable(c->regulator); | 621 | ret = regulator_disable(c->regulator); |
| 622 | if (ret != 0) | 622 | if (ret != 0) |
| 623 | dev_err(&c->pdev->dev, "cant disable regulator\n"); | 623 | dev_err(&c->pdev->dev, "can't disable regulator\n"); |
| 624 | 624 | ||
| 625 | return ret; | 625 | return ret; |
| 626 | } | 626 | } |