summaryrefslogtreecommitdiff
path: root/sound/soc/imx/imx-pcm-fiq.c
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2011-10-18 10:54:30 +0100
committerDave Airlie <airlied@redhat.com>2011-10-18 10:54:30 +0100
commit017ed8012e74ca15748863f45d2c078453026a0a (patch)
tree7071171a06de4e93fc890e0afce5c23596a26619 /sound/soc/imx/imx-pcm-fiq.c
parent80d9b24a658c83602aea66e45e2347c5bb3cbd47 (diff)
parent899e3ee404961a90b828ad527573aaaac39f0ab1 (diff)
Merge tag 'v3.1-rc10' into drm-core-nextdrm-core-next-testing
There are a number of fixes in mainline required for code in -next, also there was a few conflicts I'd rather resolve myself. Signed-off-by: Dave Airlie <airlied@redhat.com> Conflicts: drivers/gpu/drm/radeon/evergreen.c drivers/gpu/drm/radeon/r600.c drivers/gpu/drm/radeon/radeon_asic.h
Diffstat (limited to 'sound/soc/imx/imx-pcm-fiq.c')
-rw-r--r--sound/soc/imx/imx-pcm-fiq.c1
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;