diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-04-12 08:57:05 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-04-12 08:57:05 -0400 |
| commit | 48539f73cb12bc22c6c071e0a9688656126d9a4c (patch) | |
| tree | ace53a58222aa10a0bf330a1408bfb4a0410185b /sound/soc/sh/fsi.c | |
| parent | 38e8c895d33b0642dc341f83cce0adde4cffbc82 (diff) | |
| parent | 9c3372898323cb9596a23097e939df3bd83de5fc (diff) | |
Merge remote-tracking branch 'asoc/topic/fsi' into asoc-next
Diffstat (limited to 'sound/soc/sh/fsi.c')
| -rw-r--r-- | sound/soc/sh/fsi.c | 2 |
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 { | |||
| 296 | 296 | ||
| 297 | struct fsi_master { | 297 | struct fsi_master { |
| 298 | void __iomem *base; | 298 | void __iomem *base; |
| 299 | int irq; | ||
| 300 | struct fsi_priv fsia; | 299 | struct fsi_priv fsia; |
| 301 | struct fsi_priv fsib; | 300 | struct fsi_priv fsib; |
| 302 | const struct fsi_core *core; | 301 | const struct fsi_core *core; |
| @@ -2006,7 +2005,6 @@ static int fsi_probe(struct platform_device *pdev) | |||
| 2006 | } | 2005 | } |
| 2007 | 2006 | ||
| 2008 | /* master setting */ | 2007 | /* master setting */ |
| 2009 | master->irq = irq; | ||
| 2010 | master->core = core; | 2008 | master->core = core; |
| 2011 | spin_lock_init(&master->lock); | 2009 | spin_lock_init(&master->lock); |
| 2012 | 2010 | ||