summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2013-04-12 13:57:05 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2013-04-12 13:57:05 +0100
commit48539f73cb12bc22c6c071e0a9688656126d9a4c (patch)
treeace53a58222aa10a0bf330a1408bfb4a0410185b
parent38e8c895d33b0642dc341f83cce0adde4cffbc82 (diff)
parent9c3372898323cb9596a23097e939df3bd83de5fc (diff)
Merge remote-tracking branch 'asoc/topic/fsi' into asoc-next
-rw-r--r--sound/soc/sh/fsi.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/sound/soc/sh/fsi.c b/sound/soc/sh/fsi.c
index 254c6375f7a1..f830c41f97dd 100644
--- 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);