diff options
author | Takashi Iwai <tiwai@suse.de> | 2011-09-14 19:11:13 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2011-09-14 19:11:13 +0200 |
commit | 4038a12e7443b5fed3e526c475c38c115d9600f6 (patch) | |
tree | b39b8fc13c0761459c6bafa1642c6869c4e5747d /sound/soc/imx/imx-pcm-fiq.c | |
parent | ALSA: HDA: Cirrus - fix "Surround Speaker" volume control name (diff) | |
parent | ASoC: Fix trivial build regression in Kirkwood I2S (diff) | |
download | linux-dev-4038a12e7443b5fed3e526c475c38c115d9600f6.tar.xz linux-dev-4038a12e7443b5fed3e526c475c38c115d9600f6.zip |
Merge branch 'fix/asoc' into for-linus
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; |