diff options
| author | Sedji Gaouaou <sedji.gaouaou@atmel.com> | 2008-06-25 12:32:50 +0400 |
|---|---|---|
| committer | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2008-06-27 17:32:30 +0400 |
| commit | 8405996ff6d89bbf275a206eb69d10b98a8d5257 (patch) | |
| tree | 2ac62b92894498941776891c263f6f17bfd134d7 /arch/avr32 | |
| parent | 9c2baf785e90419d6f9af6bd07aa0694020cba8d (diff) | |
| download | linux-8405996ff6d89bbf275a206eb69d10b98a8d5257.tar.xz | |
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 'arch/avr32')
| -rw-r--r-- | arch/avr32/mach-at32ap/at32ap700x.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/avr32/mach-at32ap/at32ap700x.c b/arch/avr32/mach-at32ap/at32ap700x.c index a2e7b96b5e8c..2f208eb4d3c9 100644 --- a/arch/avr32/mach-at32ap/at32ap700x.c +++ b/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, |