diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2011-09-18 21:30:49 -0400 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2011-09-18 21:30:49 -0400 |
| commit | c9312209aa9fdef05b03d63bbead63bb720fd133 (patch) | |
| tree | 6704773403e34969a27f177bef22e4125378a3df /arch/arm/mach-s5pc100 | |
| parent | d5663e7a404ae97888bb8e7a7376de3fb0878ddd (diff) | |
| parent | 2213d0c0bae510df3860a48e107a5ba17ac72e99 (diff) | |
Merge branch 'next/topic-dma-pl330-devname-fix' into next/topic-dma-samsung
Conflicts:
arch/arm/mach-exynos4/clock.c
arch/arm/mach-s5p64x0/clock-s5p6440.c
arch/arm/mach-s5p64x0/clock-s5p6450.c
arch/arm/mach-s5pc100/clock.c
arch/arm/mach-s5pv210/clock.c
Diffstat (limited to 'arch/arm/mach-s5pc100')
| -rw-r--r-- | arch/arm/mach-s5pc100/clock.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-s5pc100/clock.c b/arch/arm/mach-s5pc100/clock.c index 6527c05c5fa..8d47709da71 100644 --- a/arch/arm/mach-s5pc100/clock.c +++ b/arch/arm/mach-s5pc100/clock.c | |||
| @@ -460,13 +460,13 @@ static struct clk init_clocks_off[] = { | |||
| 460 | .ctrlbit = (1 << 2), | 460 | .ctrlbit = (1 << 2), |
| 461 | }, { | 461 | }, { |
| 462 | .name = "dma", | 462 | .name = "dma", |
| 463 | .devname = "s3c-pl330.1", | 463 | .devname = "dma-pl330.1", |
| 464 | .parent = &clk_div_d1_bus.clk, | 464 | .parent = &clk_div_d1_bus.clk, |
| 465 | .enable = s5pc100_d1_0_ctrl, | 465 | .enable = s5pc100_d1_0_ctrl, |
| 466 | .ctrlbit = (1 << 1), | 466 | .ctrlbit = (1 << 1), |
| 467 | }, { | 467 | }, { |
| 468 | .name = "dma", | 468 | .name = "dma", |
| 469 | .devname = "s3c-pl330.0", | 469 | .devname = "dma-pl330.0", |
| 470 | .parent = &clk_div_d1_bus.clk, | 470 | .parent = &clk_div_d1_bus.clk, |
| 471 | .enable = s5pc100_d1_0_ctrl, | 471 | .enable = s5pc100_d1_0_ctrl, |
| 472 | .ctrlbit = (1 << 0), | 472 | .ctrlbit = (1 << 0), |