diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-03-13 17:44:51 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-03-13 17:44:51 -0400 |
| commit | 97fb44eb6bc01f4ffed4300e475aa15e44877375 (patch) | |
| tree | 481ed6efd0babe7185cae04f2fd295426b36411d /drivers/mtd/nand/mxc_nand.c | |
| parent | e4707dd3e9d0cb57597b6568a5e51fea5d6fca41 (diff) | |
| parent | 148854c65ea8046b045672fd49f4333aefaa3ab5 (diff) | |
Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel
Conflicts:
arch/arm/mach-at91/gpio.c
Diffstat (limited to 'drivers/mtd/nand/mxc_nand.c')
| -rw-r--r-- | drivers/mtd/nand/mxc_nand.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mtd/nand/mxc_nand.c b/drivers/mtd/nand/mxc_nand.c index 21fd4f1c4806..bad048aca89a 100644 --- a/drivers/mtd/nand/mxc_nand.c +++ b/drivers/mtd/nand/mxc_nand.c | |||
| @@ -880,7 +880,7 @@ static int __init mxcnd_probe(struct platform_device *pdev) | |||
| 880 | this->read_buf = mxc_nand_read_buf; | 880 | this->read_buf = mxc_nand_read_buf; |
| 881 | this->verify_buf = mxc_nand_verify_buf; | 881 | this->verify_buf = mxc_nand_verify_buf; |
| 882 | 882 | ||
| 883 | host->clk = clk_get(&pdev->dev, "nfc_clk"); | 883 | host->clk = clk_get(&pdev->dev, "nfc"); |
| 884 | if (IS_ERR(host->clk)) | 884 | if (IS_ERR(host->clk)) |
| 885 | goto eclk; | 885 | goto eclk; |
| 886 | 886 | ||