diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-09 16:31:58 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-09 16:31:58 -0400 |
commit | 9e165acf1b9e37af7c0fa39399b43d0bd8600039 (patch) | |
tree | 7ffdb0ad4c35ac9c19c4096b4f22ccc9b1eeefad /arch/arm/mach-at91/at91sam9rl.c | |
parent | 6a4690c22f5da1eb1c898b61b6a80da52fbd976f (diff) | |
parent | 791ccf2e4deeea8426b389fd0f5bb0e9167bb75d (diff) |
Merge branch 'at91' into devel
Diffstat (limited to 'arch/arm/mach-at91/at91sam9rl.c')
-rw-r--r-- | arch/arm/mach-at91/at91sam9rl.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-at91/at91sam9rl.c b/arch/arm/mach-at91/at91sam9rl.c index 556bddf35b45..252e954b49fd 100644 --- a/arch/arm/mach-at91/at91sam9rl.c +++ b/arch/arm/mach-at91/at91sam9rl.c | |||
@@ -131,8 +131,8 @@ static struct clk tc2_clk = { | |||
131 | .pmc_mask = 1 << AT91SAM9RL_ID_TC2, | 131 | .pmc_mask = 1 << AT91SAM9RL_ID_TC2, |
132 | .type = CLK_TYPE_PERIPHERAL, | 132 | .type = CLK_TYPE_PERIPHERAL, |
133 | }; | 133 | }; |
134 | static struct clk pwmc_clk = { | 134 | static struct clk pwm_clk = { |
135 | .name = "pwmc_clk", | 135 | .name = "pwm_clk", |
136 | .pmc_mask = 1 << AT91SAM9RL_ID_PWMC, | 136 | .pmc_mask = 1 << AT91SAM9RL_ID_PWMC, |
137 | .type = CLK_TYPE_PERIPHERAL, | 137 | .type = CLK_TYPE_PERIPHERAL, |
138 | }; | 138 | }; |
@@ -180,7 +180,7 @@ static struct clk *periph_clocks[] __initdata = { | |||
180 | &tc0_clk, | 180 | &tc0_clk, |
181 | &tc1_clk, | 181 | &tc1_clk, |
182 | &tc2_clk, | 182 | &tc2_clk, |
183 | &pwmc_clk, | 183 | &pwm_clk, |
184 | &tsc_clk, | 184 | &tsc_clk, |
185 | &dma_clk, | 185 | &dma_clk, |
186 | &udphs_clk, | 186 | &udphs_clk, |