diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-11-29 21:33:47 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-11-29 21:33:47 +0300 |
| commit | 649e5fb033bbadbfa78aba5e2711f1faf2affaf0 (patch) | |
| tree | 99c9deb1e7714709bf2a5ccd1d952742dd2a001f /sound/soc/nuc900/nuc900-pcm.c | |
| parent | df0701bb8660107e811bddba6e4933385f697a21 (diff) | |
| parent | 39a545559f8d5f13e8a4a7dfddcaad0e2ba9bcfb (diff) | |
| download | linux-649e5fb033bbadbfa78aba5e2711f1faf2affaf0.tar.xz | |
Merge branch 'for-2.6.37' into for-2.6.38
Diffstat (limited to 'sound/soc/nuc900/nuc900-pcm.c')
| -rw-r--r-- | sound/soc/nuc900/nuc900-pcm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/nuc900/nuc900-pcm.c b/sound/soc/nuc900/nuc900-pcm.c index 195d1ac94771..2245f8b8edc1 100644 --- a/sound/soc/nuc900/nuc900-pcm.c +++ b/sound/soc/nuc900/nuc900-pcm.c @@ -332,7 +332,7 @@ static struct snd_soc_platform_driver nuc900_soc_platform = { .ops = &nuc900_dma_ops, .pcm_new = nuc900_dma_new, .pcm_free = nuc900_dma_free_dma_buffers, -} +}; static int __devinit nuc900_soc_platform_probe(struct platform_device *pdev) { |