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/at91sam9263.c | |
| parent | 6a4690c22f5da1eb1c898b61b6a80da52fbd976f (diff) | |
| parent | 791ccf2e4deeea8426b389fd0f5bb0e9167bb75d (diff) | |
Merge branch 'at91' into devel
Diffstat (limited to 'arch/arm/mach-at91/at91sam9263.c')
| -rw-r--r-- | arch/arm/mach-at91/at91sam9263.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-at91/at91sam9263.c b/arch/arm/mach-at91/at91sam9263.c index 80bfab5680e2..ada4b6769107 100644 --- a/arch/arm/mach-at91/at91sam9263.c +++ b/arch/arm/mach-at91/at91sam9263.c | |||
| @@ -129,8 +129,8 @@ static struct clk tcb_clk = { | |||
| 129 | .pmc_mask = 1 << AT91SAM9263_ID_TCB, | 129 | .pmc_mask = 1 << AT91SAM9263_ID_TCB, |
| 130 | .type = CLK_TYPE_PERIPHERAL, | 130 | .type = CLK_TYPE_PERIPHERAL, |
| 131 | }; | 131 | }; |
| 132 | static struct clk pwmc_clk = { | 132 | static struct clk pwm_clk = { |
| 133 | .name = "pwmc_clk", | 133 | .name = "pwm_clk", |
| 134 | .pmc_mask = 1 << AT91SAM9263_ID_PWMC, | 134 | .pmc_mask = 1 << AT91SAM9263_ID_PWMC, |
| 135 | .type = CLK_TYPE_PERIPHERAL, | 135 | .type = CLK_TYPE_PERIPHERAL, |
| 136 | }; | 136 | }; |
| @@ -187,7 +187,7 @@ static struct clk *periph_clocks[] __initdata = { | |||
| 187 | &ssc1_clk, | 187 | &ssc1_clk, |
| 188 | &ac97_clk, | 188 | &ac97_clk, |
| 189 | &tcb_clk, | 189 | &tcb_clk, |
| 190 | &pwmc_clk, | 190 | &pwm_clk, |
| 191 | &macb_clk, | 191 | &macb_clk, |
| 192 | &twodge_clk, | 192 | &twodge_clk, |
| 193 | &udc_clk, | 193 | &udc_clk, |