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

48539f73 · Mark Brown · 38e8c895 · 9c337289 · 48539f73
Commit 48539f73 authored Apr 12, 2013 by Mark Brown
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 2 deletions

sound/soc/sh/fsi.c sound/soc/sh/fsi.c +0 -2

No files found.
--- 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);