summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-pxa/pwm.c
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2008-11-27 12:39:14 +0000
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-11-27 12:39:14 +0000
commite902be56cbf2a48d96d11d6884767e638d41c712 (patch)
treee4d79479a1280ad4841005680e37119d6694c3bf /arch/arm/mach-pxa/pwm.c
parentc750815e2d436f4379c7af8a8770ef2ae71c5607 (diff)
parent5e1dbdb458ada37f7e97265cb2ea87c55fd5d034 (diff)
Merge branches 'core' and 'clks' into devel
Diffstat (limited to 'arch/arm/mach-pxa/pwm.c')
-rw-r--r--arch/arm/mach-pxa/pwm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/pwm.c b/arch/arm/mach-pxa/pwm.c
index 74e2ead8cee..3ca7ffc6904 100644
--- a/arch/arm/mach-pxa/pwm.c
+++ b/arch/arm/mach-pxa/pwm.c
@@ -173,7 +173,7 @@ static struct pwm_device *pwm_probe(struct platform_device *pdev,
return ERR_PTR(-ENOMEM);
}
- pwm->clk = clk_get(&pdev->dev, "PWMCLK");
+ pwm->clk = clk_get(&pdev->dev, NULL);
if (IS_ERR(pwm->clk)) {
ret = PTR_ERR(pwm->clk);
goto err_free;