diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-11-27 07:39:14 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-11-27 07:39:14 -0500 |
| commit | e902be56cbf2a48d96d11d6884767e638d41c712 (patch) | |
| tree | e4d79479a1280ad4841005680e37119d6694c3bf /drivers/mtd | |
| parent | c750815e2d436f4379c7af8a8770ef2ae71c5607 (diff) | |
| parent | 5e1dbdb458ada37f7e97265cb2ea87c55fd5d034 (diff) | |
Merge branches 'core' and 'clks' into devel
Diffstat (limited to 'drivers/mtd')
| -rw-r--r-- | drivers/mtd/nand/pxa3xx_nand.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mtd/nand/pxa3xx_nand.c b/drivers/mtd/nand/pxa3xx_nand.c index c0fa9c9edf08..61c922a8356f 100644 --- a/drivers/mtd/nand/pxa3xx_nand.c +++ b/drivers/mtd/nand/pxa3xx_nand.c | |||
| @@ -1079,7 +1079,7 @@ static int pxa3xx_nand_probe(struct platform_device *pdev) | |||
| 1079 | this = &info->nand_chip; | 1079 | this = &info->nand_chip; |
| 1080 | mtd->priv = info; | 1080 | mtd->priv = info; |
| 1081 | 1081 | ||
| 1082 | info->clk = clk_get(&pdev->dev, "NANDCLK"); | 1082 | info->clk = clk_get(&pdev->dev, NULL); |
| 1083 | if (IS_ERR(info->clk)) { | 1083 | if (IS_ERR(info->clk)) { |
| 1084 | dev_err(&pdev->dev, "failed to get nand clock\n"); | 1084 | dev_err(&pdev->dev, "failed to get nand clock\n"); |
| 1085 | ret = PTR_ERR(info->clk); | 1085 | ret = PTR_ERR(info->clk); |