diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2010-12-30 10:44:53 +0900 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2010-12-30 10:44:53 +0900 |
| commit | 5ed76f3d98ffb6ebd754fc7c4cae547d6ffed5ff (patch) | |
| tree | 98bb33961415f8b2d011094a6bc398943f238681 /arch/arm/mach-s5p64x0/clock-s5p6440.c | |
| parent | 724c35cf530651f68f5958dc02e0b49ac6661226 (diff) | |
| parent | 9af7d94f2966895b37b8ef1e0d88bd4d9e317e74 (diff) | |
| download | blackbird-obmc-linux-5ed76f3d98ffb6ebd754fc7c4cae547d6ffed5ff.tar.gz blackbird-obmc-linux-5ed76f3d98ffb6ebd754fc7c4cae547d6ffed5ff.zip | |
Merge branch 'next-s5p64x0' into for-next-new
Diffstat (limited to 'arch/arm/mach-s5p64x0/clock-s5p6440.c')
| -rw-r--r-- | arch/arm/mach-s5p64x0/clock-s5p6440.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-s5p64x0/clock-s5p6440.c b/arch/arm/mach-s5p64x0/clock-s5p6440.c index 409c5fc3670d..40137c6f0488 100644 --- a/arch/arm/mach-s5p64x0/clock-s5p6440.c +++ b/arch/arm/mach-s5p64x0/clock-s5p6440.c @@ -419,7 +419,7 @@ static struct clksrc_sources clkset_audio = { static struct clksrc_clk clksrcs[] = { { .clk = { - .name = "mmc_bus", + .name = "sclk_mmc", .id = 0, .ctrlbit = (1 << 24), .enable = s5p64x0_sclk_ctrl, @@ -429,7 +429,7 @@ static struct clksrc_clk clksrcs[] = { .reg_div = { .reg = S5P64X0_CLK_DIV1, .shift = 0, .size = 4 }, }, { .clk = { - .name = "mmc_bus", + .name = "sclk_mmc", .id = 1, .ctrlbit = (1 << 25), .enable = s5p64x0_sclk_ctrl, @@ -439,7 +439,7 @@ static struct clksrc_clk clksrcs[] = { .reg_div = { .reg = S5P64X0_CLK_DIV1, .shift = 4, .size = 4 }, }, { .clk = { - .name = "mmc_bus", + .name = "sclk_mmc", .id = 2, .ctrlbit = (1 << 26), .enable = s5p64x0_sclk_ctrl, |
