diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2010-12-21 23:11:38 -0500 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2010-12-21 23:11:38 -0500 |
| commit | ce8aceae842bceaa4d74a9122208576e5a00c9a3 (patch) | |
| tree | 701bf9498647ebd4ae210d8f5f698e68bc9a8d71 /arch/arm/mach-s3c64xx/clock.c | |
| parent | 90a8a73c06cc32b609a880d48449d7083327e11a (diff) | |
| parent | 460ed699f4c943e1ec4a8458869eb532fe31fd16 (diff) | |
Merge branch 'next-samsung-asoc' into next-samsung-asoc2
Diffstat (limited to 'arch/arm/mach-s3c64xx/clock.c')
| -rw-r--r-- | arch/arm/mach-s3c64xx/clock.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c64xx/clock.c b/arch/arm/mach-s3c64xx/clock.c index 7e03f0ae2fc8..1c98d2ff2ed6 100644 --- a/arch/arm/mach-s3c64xx/clock.c +++ b/arch/arm/mach-s3c64xx/clock.c | |||
| @@ -695,7 +695,7 @@ static struct clksrc_clk clksrcs[] = { | |||
| 695 | }, { | 695 | }, { |
| 696 | .clk = { | 696 | .clk = { |
| 697 | .name = "audio-bus", | 697 | .name = "audio-bus", |
| 698 | .id = -1, /* There's only one IISv4 port */ | 698 | .id = 2, |
| 699 | .ctrlbit = S3C6410_CLKCON_SCLK_AUDIO2, | 699 | .ctrlbit = S3C6410_CLKCON_SCLK_AUDIO2, |
| 700 | .enable = s3c64xx_sclk_ctrl, | 700 | .enable = s3c64xx_sclk_ctrl, |
| 701 | }, | 701 | }, |