diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-05-17 18:14:21 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-05-17 18:14:21 +0200 |
| commit | 32535bd5637d3152f944f124bcc82d498892ba1b (patch) | |
| tree | 99d33b58cfec44f4cf95fad5efa75aea0dd7d60b /sound/soc/sh/migor.c | |
| parent | Revert "USB: serial: sierra: put reset_resume callback back." (diff) | |
| parent | ARM: EXYNOS: Add s3c-hsotg device support for Universal C210 board (diff) | |
| download | linux-32535bd5637d3152f944f124bcc82d498892ba1b.tar.xz linux-32535bd5637d3152f944f124bcc82d498892ba1b.zip | |
Merge branch 'v3.5-for-usb' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into usb-next
Diffstat (limited to 'sound/soc/sh/migor.c')
| -rw-r--r-- | sound/soc/sh/migor.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/sh/migor.c b/sound/soc/sh/migor.c index 9d9ad8d61c0a..8526e1edaf45 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, }; |