diff options
author | Kukjin Kim <kgene.kim@samsung.com> | 2011-09-19 10:30:49 +0900 |
---|---|---|
committer | Kukjin Kim <kgene.kim@samsung.com> | 2011-09-19 10:30:49 +0900 |
commit | c9312209aa9fdef05b03d63bbead63bb720fd133 (patch) | |
tree | 6704773403e34969a27f177bef22e4125378a3df /arch/arm/mach-s5p64x0/clock-s5p6450.c | |
parent | d5663e7a404ae97888bb8e7a7376de3fb0878ddd (diff) | |
parent | 2213d0c0bae510df3860a48e107a5ba17ac72e99 (diff) | |
download | op-kernel-dev-c9312209aa9fdef05b03d63bbead63bb720fd133.zip op-kernel-dev-c9312209aa9fdef05b03d63bbead63bb720fd133.tar.gz |
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-s5p64x0/clock-s5p6450.c')
-rw-r--r-- | arch/arm/mach-s5p64x0/clock-s5p6450.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-s5p64x0/clock-s5p6450.c b/arch/arm/mach-s5p64x0/clock-s5p6450.c index 3d9b609..2d04abf 100644 --- a/arch/arm/mach-s5p64x0/clock-s5p6450.c +++ b/arch/arm/mach-s5p64x0/clock-s5p6450.c @@ -180,6 +180,7 @@ static struct clk init_clocks_off[] = { .ctrlbit = (1 << 3), }, { .name = "dma", + .devname = "dma-pl330", .parent = &clk_hclk_low.clk, .enable = s5p64x0_hclk0_ctrl, .ctrlbit = (1 << 12), |