diff options
| author | Sedji Gaouaou <sedji.gaouaou@atmel.com> | 2008-06-25 10:32:50 +0200 |
|---|---|---|
| committer | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2008-06-27 15:32:30 +0200 |
| commit | 8405996ff6d89bbf275a206eb69d10b98a8d5257 (patch) | |
| tree | 2ac62b92894498941776891c263f6f17bfd134d7 /drivers/misc | |
| parent | 9c2baf785e90419d6f9af6bd07aa0694020cba8d (diff) | |
| download | linux-8405996ff6d89bbf275a206eb69d10b98a8d5257.tar.gz linux-8405996ff6d89bbf275a206eb69d10b98a8d5257.tar.bz2 linux-8405996ff6d89bbf275a206eb69d10b98a8d5257.zip | |
atmel_pwm: Rename the "mck" clock to "pwm_clk"
The name "mck" causes a conflict on AT91. Call it "pwm_clk" instead.
Signed-off-by: Sedji Gaouaou <sedji.gaouaou@atmel.com>
Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
Diffstat (limited to 'drivers/misc')
| -rw-r--r-- | drivers/misc/atmel_pwm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/misc/atmel_pwm.c b/drivers/misc/atmel_pwm.c index 0d5ce03cdff2..5b5a14dab3d3 100644 --- a/drivers/misc/atmel_pwm.c +++ b/drivers/misc/atmel_pwm.c @@ -332,7 +332,7 @@ static int __init pwm_probe(struct platform_device *pdev) p->base = ioremap(r->start, r->end - r->start + 1); if (!p->base) goto fail; - p->clk = clk_get(&pdev->dev, "mck"); + p->clk = clk_get(&pdev->dev, "pwm_clk"); if (IS_ERR(p->clk)) { status = PTR_ERR(p->clk); p->clk = NULL; |