summaryrefslogtreecommitdiff
path: root/sound/soc/fsl/fsl_ssi.c
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-06-01 14:02:07 +0100
committerMark Brown <broonie@linaro.org>2014-06-01 14:02:07 +0100
commit287d414eacaa681413ea89adfa5b3a0d12d2ab1a (patch)
treea4ef6c55bc2b2177f8a4144663c68e6e345b64cc /sound/soc/fsl/fsl_ssi.c
parent432481220101166a0b33dc6f951b38a8af3d281c (diff)
parent7b8751abdd34a2f924c37c29ad61d598f5d29e7b (diff)
downloadkernel-287d414eacaa681413ea89adfa5b3a0d12d2ab1a.tar.gz
Merge branch 'topic/fsl' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-fsl-ssi
Conflicts: sound/soc/fsl/Kconfig
Diffstat (limited to 'sound/soc/fsl/fsl_ssi.c')
-rw-r--r--sound/soc/fsl/fsl_ssi.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c
index 8d58b50bfbee..9bfef55d77d1 100644
--- a/sound/soc/fsl/fsl_ssi.c
+++ b/sound/soc/fsl/fsl_ssi.c
@@ -39,6 +39,7 @@
#include <linux/delay.h>
#include <linux/slab.h>
#include <linux/spinlock.h>
+#include <linux/of.h>
#include <linux/of_address.h>
#include <linux/of_irq.h>
#include <linux/of_platform.h>