summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-s5pc100
diff options
context:
space:
mode:
authorKukjin Kim <kgene.kim@samsung.com>2011-09-19 10:30:49 +0900
committerKukjin Kim <kgene.kim@samsung.com>2011-09-19 10:30:49 +0900
commitc9312209aa9fdef05b03d63bbead63bb720fd133 (patch)
tree6704773403e34969a27f177bef22e4125378a3df /arch/arm/mach-s5pc100
parentd5663e7a404ae97888bb8e7a7376de3fb0878ddd (diff)
parent2213d0c0bae510df3860a48e107a5ba17ac72e99 (diff)
downloadblackbird-op-linux-c9312209aa9fdef05b03d63bbead63bb720fd133.tar.gz
blackbird-op-linux-c9312209aa9fdef05b03d63bbead63bb720fd133.zip
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.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-s5pc100/clock.c b/arch/arm/mach-s5pc100/clock.c
index 6527c05c5fa1..8d47709da713 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[] = {
.ctrlbit = (1 << 2),
}, {
.name = "dma",
- .devname = "s3c-pl330.1",
+ .devname = "dma-pl330.1",
.parent = &clk_div_d1_bus.clk,
.enable = s5pc100_d1_0_ctrl,
.ctrlbit = (1 << 1),
}, {
.name = "dma",
- .devname = "s3c-pl330.0",
+ .devname = "dma-pl330.0",
.parent = &clk_div_d1_bus.clk,
.enable = s5pc100_d1_0_ctrl,
.ctrlbit = (1 << 0),
OpenPOWER on IntegriCloud