aboutsummaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2012-05-09 14:03:29 +0200
committerTakashi Iwai <tiwai@suse.de>2012-05-09 14:03:29 +0200
commit9ea3356d7979909d19252f7e552fb879643eaa70 (patch)
tree3e10d6477d65d2a7b274cfad2ea03c2f6d75246e /sound
parent32cf4023e689ad5b3a81a749d8cc99d7f184cb99 (diff)
parentc8587193ba511b788a9888e5e701a9747e70c0d8 (diff)
downloadlinux-9ea3356d7979909d19252f7e552fb879643eaa70.tar.gz
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...
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/sh/migor.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/sh/migor.c b/sound/soc/sh/migor.c
index 9d9ad8d61c0..8526e1edaf4 100644
--- 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,
};