diff --git a/[refs] b/[refs] index 9f9c438a23e8..be95b6b3089f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 49965e658674f40eb5cb72be6833eb49b1770961 +refs/heads/master: 2f3ab04a47c9b5e7c93400601e8f69bef0fa184a diff --git a/trunk/arch/arm/mach-exynos4/clock.c b/trunk/arch/arm/mach-exynos4/clock.c index 98b5cc4a9b20..66494f28bbef 100644 --- a/trunk/arch/arm/mach-exynos4/clock.c +++ b/trunk/arch/arm/mach-exynos4/clock.c @@ -406,12 +406,12 @@ static struct clk init_clocks_off[] = { .ctrlbit = (1 << 3), }, { .name = "fimd", - .devname = "s5pv310-fb.0", + .devname = "exynos4-fb.0", .enable = exynos4_clk_ip_lcd0_ctrl, .ctrlbit = (1 << 0), }, { .name = "fimd", - .devname = "s5pv310-fb.1", + .devname = "exynos4-fb.1", .enable = exynos4_clk_ip_lcd1_ctrl, .ctrlbit = (1 << 0), }, { @@ -909,7 +909,7 @@ static struct clksrc_clk clksrcs[] = { }, { .clk = { .name = "sclk_fimd", - .devname = "s5pv310-fb.0", + .devname = "exynos4-fb.0", .enable = exynos4_clksrc_mask_lcd0_ctrl, .ctrlbit = (1 << 0), }, @@ -919,7 +919,7 @@ static struct clksrc_clk clksrcs[] = { }, { .clk = { .name = "sclk_fimd", - .devname = "s5pv310-fb.1", + .devname = "exynos4-fb.1", .enable = exynos4_clksrc_mask_lcd1_ctrl, .ctrlbit = (1 << 0), },