From 289598c2738f6bd9b5958a95491d27a6b55b3295 Mon Sep 17 00:00:00 2001 From: Dongjin Kim Date: Tue, 18 Dec 2012 08:57:06 -0800 Subject: [PATCH] --- yaml --- r: 347758 b: refs/heads/master c: 454696fdc864aacaab978755d44d73d418c59788 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-exynos/clock-exynos4.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 578a01b49399..e24a25abc308 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 873673d302e48051c5b90c6e27f86400bdd366ba +refs/heads/master: 454696fdc864aacaab978755d44d73d418c59788 diff --git a/trunk/arch/arm/mach-exynos/clock-exynos4.c b/trunk/arch/arm/mach-exynos/clock-exynos4.c index efead60b9436..bbcb3dea0d40 100644 --- a/trunk/arch/arm/mach-exynos/clock-exynos4.c +++ b/trunk/arch/arm/mach-exynos/clock-exynos4.c @@ -529,7 +529,7 @@ static struct clk exynos4_init_clocks_off[] = { .enable = exynos4_clk_ip_fsys_ctrl, .ctrlbit = (1 << 8), }, { - .name = "dwmmc", + .name = "biu", .parent = &exynos4_clk_aclk_133.clk, .enable = exynos4_clk_ip_fsys_ctrl, .ctrlbit = (1 << 9), @@ -1134,7 +1134,7 @@ static struct clksrc_clk exynos4_clksrcs[] = { .reg_div = { .reg = EXYNOS4_CLKDIV_MFC, .shift = 0, .size = 4 }, }, { .clk = { - .name = "sclk_dwmmc", + .name = "ciu", .parent = &exynos4_clk_dout_mmc4.clk, .enable = exynos4_clksrc_mask_fsys_ctrl, .ctrlbit = (1 << 16),