aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/mach-exynos/clock-exynos5.c
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2012-05-12 15:41:22 -0700
committerOlof Johansson <olof@lixom.net>2012-05-12 15:41:22 -0700
commit85d5c4a362add39f7491b38ed0160df1dcae1d2b (patch)
tree62cc791433225c64eddcfcf8f66c93e90ac7f0d1 /arch/arm/mach-exynos/clock-exynos5.c
parentd2919c651e750a58c3dd8b0183ac1b2700cdc01d (diff)
parent28b874a8ba7aed5152dc426dde38239ce23d8b37 (diff)
downloadlinux-stericsson-85d5c4a362add39f7491b38ed0160df1dcae1d2b.tar.gz
Merge branch 'v3.4-samsung-fixes-5' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into fixes
* 'v3.4-samsung-fixes-5' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung: ARM: EXYNOS: fix ctrlbit for exynos5_clk_pdma1 ARM: EXYNOS: use s5p-timer for UniversalC210 board
Diffstat (limited to 'arch/arm/mach-exynos/clock-exynos5.c')
-rw-r--r--arch/arm/mach-exynos/clock-exynos5.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-exynos/clock-exynos5.c b/arch/arm/mach-exynos/clock-exynos5.c
index 5cd7a8b8868c..7ac6ff4c46bd 100644
--- a/arch/arm/mach-exynos/clock-exynos5.c
+++ b/arch/arm/mach-exynos/clock-exynos5.c
@@ -678,7 +678,7 @@ static struct clk exynos5_clk_pdma1 = {
.name = "dma",
.devname = "dma-pl330.1",
.enable = exynos5_clk_ip_fsys_ctrl,
- .ctrlbit = (1 << 1),
+ .ctrlbit = (1 << 2),
};
static struct clk exynos5_clk_mdma1 = {