diff options
author | Paul Mundt <lethal@linux-sh.org> | 2011-10-28 09:16:43 +0400 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2011-10-28 09:16:43 +0400 |
commit | d4d9781d1dd04ff134e3d43383dfa9991f7c54c6 (patch) | |
tree | 28e799ec49f72bf37f39d192d21f25bffb682aab /sound/soc/imx/imx-pcm-fiq.c | |
parent | f5a18f932e051ff0f19dcd80a421a4dd9b11f10f (diff) | |
parent | 396e6e49c58bb23d1814d3c240c736c9f01523c5 (diff) | |
download | linux-d4d9781d1dd04ff134e3d43383dfa9991f7c54c6.tar.xz |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into sh-latest
Diffstat (limited to 'sound/soc/imx/imx-pcm-fiq.c')
-rw-r--r-- | sound/soc/imx/imx-pcm-fiq.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/soc/imx/imx-pcm-fiq.c b/sound/soc/imx/imx-pcm-fiq.c index 309c59e6fb6c..7945625e0e08 100644 --- a/sound/soc/imx/imx-pcm-fiq.c +++ b/sound/soc/imx/imx-pcm-fiq.c @@ -240,7 +240,6 @@ static int ssi_irq = 0; static int imx_pcm_fiq_new(struct snd_soc_pcm_runtime *rtd) { - struct snd_card *card = rtd->card->snd_card; struct snd_soc_dai *dai = rtd->cpu_dai; struct snd_pcm *pcm = rtd->pcm; int ret; |