Merge tag 'asoc-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

tiwai · tiwai · commit 9ea3356d7979 · 2012-05-09T14:03:29.000+02:00
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
@@ -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,
 };
 

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ static unsigned long siumckb_recalc(struct clk *clk)`
`35`	`35`	`return codec_freq;`
`36`	`36`	`}`
`37`	`37`
`38`		`-static struct clk_ops siumckb_clk_ops = {`
	`38`	`+static struct sh_clk_ops siumckb_clk_ops = {`
`39`	`39`	`.recalc = siumckb_recalc,`
`40`	`40`	`};`
`41`	`41`