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...
mariux64 · May 9, 2012 · 9ea3356 · 9ea3356
2 parents 32cf402 + c858719
commit 9ea3356
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/sound/soc/sh/migor.c b/sound/soc/sh/migor.c
@@ -35,7 +35,7 @@ static unsigned long siumckb_recalc(struct clk *clk)
 	return codec_freq;
 }
 
-static struct clk_ops siumckb_clk_ops = {
+static struct sh_clk_ops siumckb_clk_ops = {
 	.recalc = siumckb_recalc,
 };