From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Sun, 9 Dec 2012 15:22:08 +0000 (+0900)
Subject: Merge remote-tracking branch 'asoc/topic/fsi' into asoc-next
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=954f497f7167de273b6e062de84689ccd8bf999d;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

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

954f497f7167de273b6e062de84689ccd8bf999d
diff --cc sound/soc/sh/fsi.c
index 9d7f30774a44,e74c4ebc957a..a606d0f93d1c
--- 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 */