diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2010-12-22 13:11:38 +0900 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2010-12-22 13:11:38 +0900 |
| commit | ce8aceae842bceaa4d74a9122208576e5a00c9a3 (patch) | |
| tree | 701bf9498647ebd4ae210d8f5f698e68bc9a8d71 /arch/arm/mach-s5p64x0/clock-s5p6440.c | |
| parent | 90a8a73c06cc32b609a880d48449d7083327e11a (diff) | |
| parent | 460ed699f4c943e1ec4a8458869eb532fe31fd16 (diff) | |
| download | talos-op-linux-ce8aceae842bceaa4d74a9122208576e5a00c9a3.tar.gz talos-op-linux-ce8aceae842bceaa4d74a9122208576e5a00c9a3.zip | |
Merge branch 'next-samsung-asoc' into next-samsung-asoc2
Diffstat (limited to 'arch/arm/mach-s5p64x0/clock-s5p6440.c')
| -rw-r--r-- | arch/arm/mach-s5p64x0/clock-s5p6440.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-s5p64x0/clock-s5p6440.c b/arch/arm/mach-s5p64x0/clock-s5p6440.c index e4883dc1c8d7..409c5fc3670d 100644 --- a/arch/arm/mach-s5p64x0/clock-s5p6440.c +++ b/arch/arm/mach-s5p64x0/clock-s5p6440.c @@ -261,7 +261,7 @@ static struct clk init_clocks_disable[] = { .enable = s5p64x0_pclk_ctrl, .ctrlbit = (1 << 25), }, { - .name = "i2s_v40", + .name = "iis", .id = 0, .parent = &clk_pclk_low.clk, .enable = s5p64x0_pclk_ctrl, |
