summaryrefslogtreecommitdiff
path: root/drivers/mtd
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2008-11-27 12:39:14 (GMT)
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-11-27 12:39:14 (GMT)
commite902be56cbf2a48d96d11d6884767e638d41c712 (patch)
treee4d79479a1280ad4841005680e37119d6694c3bf /drivers/mtd
parentc750815e2d436f4379c7af8a8770ef2ae71c5607 (diff)
parent5e1dbdb458ada37f7e97265cb2ea87c55fd5d034 (diff)
downloadlinux-e902be56cbf2a48d96d11d6884767e638d41c712.tar.xz
Merge branches 'core' and 'clks' into devel
Diffstat (limited to 'drivers/mtd')
-rw-r--r--drivers/mtd/nand/pxa3xx_nand.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mtd/nand/pxa3xx_nand.c b/drivers/mtd/nand/pxa3xx_nand.c
index c0fa9c9..61c922a 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)
this = &info->nand_chip;
mtd->priv = info;
- info->clk = clk_get(&pdev->dev, "NANDCLK");
+ info->clk = clk_get(&pdev->dev, NULL);
if (IS_ERR(info->clk)) {
dev_err(&pdev->dev, "failed to get nand clock\n");
ret = PTR_ERR(info->clk);