Commit efd614ac authored by Mark Brown's avatar Mark Brown

Merge branch 'for-3.1' into for-3.2

parents da1c6ea6 117ef957
...@@ -240,7 +240,6 @@ static int ssi_irq = 0; ...@@ -240,7 +240,6 @@ static int ssi_irq = 0;
static int imx_pcm_fiq_new(struct snd_soc_pcm_runtime *rtd) 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_soc_dai *dai = rtd->cpu_dai;
struct snd_pcm *pcm = rtd->pcm; struct snd_pcm *pcm = rtd->pcm;
struct snd_pcm_substream *substream; struct snd_pcm_substream *substream;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment