Merge tag 'asoc-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound...
authorTakashi Iwai <tiwai@suse.de>
Wed, 9 May 2012 12:03:29 +0000 (14:03 +0200)
committerTakashi Iwai <tiwai@suse.de>
Wed, 9 May 2012 12:03:29 +0000 (14:03 +0200)
ASoC: Build fix for SH in 3.4

An API update which wasn't sufficiently thorough in updating the tree...

sound/soc/sh/migor.c

index 9d9ad8d..8526e1e 100644 (file)
@@ -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,
 };