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

diff --cc sound/soc/sh/fsi.c
index 9d7f30774a44d9524cb71f6697fc0ce96825295c,e74c4ebc957aa4771d9bdc9ee53a0b31331319d8..a606d0f93d1cea4db2e88f47e8ba0d94b36aa59f
--- 1/sound/soc/sh/fsi.c
--- 2/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 */