| commit | 9ea3356d7979909d19252f7e552fb879643eaa70 | [log] [tgz] |
|---|---|---|
| author | Takashi Iwai <tiwai@suse.de> | Wed May 09 14:03:29 2012 +0200 |
| committer | Takashi Iwai <tiwai@suse.de> | Wed May 09 14:03:29 2012 +0200 |
| tree | 3e10d6477d65d2a7b274cfad2ea03c2f6d75246e | |
| parent | 32cf4023e689ad5b3a81a749d8cc99d7f184cb99 [diff] | |
| parent | c8587193ba511b788a9888e5e701a9747e70c0d8 [diff] |
Merge tag 'asoc-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus ASoC: Build fix for SH in 3.4 An API update which wasn't sufficiently thorough in updating the tree...
diff --git a/sound/soc/sh/migor.c b/sound/soc/sh/migor.c index 9d9ad8d..8526e1e 100644 --- a/sound/soc/sh/migor.c +++ b/sound/soc/sh/migor.c
@@ -35,7 +35,7 @@ return codec_freq; } -static struct clk_ops siumckb_clk_ops = { +static struct sh_clk_ops siumckb_clk_ops = { .recalc = siumckb_recalc, };