summaryrefslogtreecommitdiffstats
path: root/sound/soc/samsung/s3c24xx-i2s.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2014-01-29 07:35:19 +0100
committerTakashi Iwai <tiwai@suse.de>2014-01-29 07:35:19 +0100
commita31886669f6277a8576af6e917c3958c780a4ebf (patch)
tree195338489a866f54af718a67122150bd78c5cc42 /sound/soc/samsung/s3c24xx-i2s.c
parente7729a415315fcd9516912050d85d5aaebcededc (diff)
parente65523ca79fd087d9888598eadeb9554e2bd2102 (diff)
downloadop-kernel-dev-a31886669f6277a8576af6e917c3958c780a4ebf.zip
op-kernel-dev-a31886669f6277a8576af6e917c3958c780a4ebf.tar.gz
Merge tag 'asoc-v3.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v3.14 A few fixes, all in drivers. Nothing stands out particularly, the biggest set of fixes is some build coverage issues from Sachin.
Diffstat (limited to 'sound/soc/samsung/s3c24xx-i2s.c')
-rw-r--r--sound/soc/samsung/s3c24xx-i2s.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/soc/samsung/s3c24xx-i2s.c b/sound/soc/samsung/s3c24xx-i2s.c
index 9c8ebd8..f31e916 100644
--- a/sound/soc/samsung/s3c24xx-i2s.c
+++ b/sound/soc/samsung/s3c24xx-i2s.c
@@ -24,6 +24,8 @@
#include <sound/pcm_params.h>
#include <mach/dma.h>
+#include <mach/gpio-samsung.h>
+#include <plat/gpio-cfg.h>
#include "regs-iis.h"
#include "dma.h"
OpenPOWER on IntegriCloud