From fc3e0af6773e1d83c8c895874477db5de908ae21 Mon Sep 17 00:00:00 2001
From: Sedji Gaouaou <sedji.gaouaou@atmel.com>
Date: Wed, 25 Jun 2008 10:32:50 +0200
Subject: [PATCH] --- yaml --- r: 99234 b: refs/heads/master c:
 8405996ff6d89bbf275a206eb69d10b98a8d5257 h: refs/heads/master v: v3

---
 [refs]                                    | 2 +-
 trunk/arch/avr32/mach-at32ap/at32ap700x.c | 2 +-
 trunk/drivers/misc/atmel_pwm.c            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 0970d767b2f6..60676eeace22 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9c2baf785e90419d6f9af6bd07aa0694020cba8d
+refs/heads/master: 8405996ff6d89bbf275a206eb69d10b98a8d5257
diff --git a/trunk/arch/avr32/mach-at32ap/at32ap700x.c b/trunk/arch/avr32/mach-at32ap/at32ap700x.c
index a2e7b96b5e8c..2f208eb4d3c9 100644
--- a/trunk/arch/avr32/mach-at32ap/at32ap700x.c
+++ b/trunk/arch/avr32/mach-at32ap/at32ap700x.c
@@ -1471,7 +1471,7 @@ static struct resource atmel_pwm0_resource[] __initdata = {
 	IRQ(24),
 };
 static struct clk atmel_pwm0_mck = {
-	.name		= "mck",
+	.name		= "pwm_clk",
 	.parent		= &pbb_clk,
 	.mode		= pbb_clk_mode,
 	.get_rate	= pbb_clk_get_rate,
diff --git a/trunk/drivers/misc/atmel_pwm.c b/trunk/drivers/misc/atmel_pwm.c
index 0d5ce03cdff2..5b5a14dab3d3 100644
--- a/trunk/drivers/misc/atmel_pwm.c
+++ b/trunk/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;