Merge remote-tracking branch 'asoc/topic/fsi' into asoc-next

git-mirror · Apr 12, 2013 · 48539f7 · 48539f7
2 parents 38e8c89 + 9c33728
commit 48539f7
Showing 1 changed file with 0 additions and 2 deletions.
diff --git a/sound/soc/sh/fsi.c b/sound/soc/sh/fsi.c
@@ -296,7 +296,6 @@ struct fsi_core {
 
 struct fsi_master {
 	void __iomem *base;
-	int irq;
 	struct fsi_priv fsia;
 	struct fsi_priv fsib;
 	const struct fsi_core *core;
@@ -2006,7 +2005,6 @@ static int fsi_probe(struct platform_device *pdev)
 	}
 
 	/* master setting */
-	master->irq		= irq;
 	master->core		= core;
 	spin_lock_init(&master->lock);