From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Sun, 2 Dec 2012 04:35:04 +0000 (+0900)
Subject: Merge remote-tracking branch 'asoc/topic/fsi' into asoc-next
X-Git-Tag: v3.8-rc1~133^2~42^2~38
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=546694bc42a4ee4f1a5d2f14e1c71d11fdafba4d;p=thirdparty%2Fkernel%2Flinux.git

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

546694bc42a4ee4f1a5d2f14e1c71d11fdafba4d
diff --cc sound/soc/sh/fsi.c
index 9d7f30774a44d,e74c4ebc957aa..a606d0f93d1ce
--- a/sound/soc/sh/fsi.c
+++ b/sound/soc/sh/fsi.c
@@@ -20,8 -20,8 +20,9 @@@
  #include <linux/sh_dma.h>
  #include <linux/slab.h>
  #include <linux/module.h>
 +#include <linux/workqueue.h>
  #include <sound/soc.h>
+ #include <sound/pcm_params.h>
  #include <sound/sh_fsi.h>
  
  /* PortA/PortB register */