projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'sound-asoc/for-next'
[deliverable/linux.git]
/
sound
/
soc
/
samsung
/
s3c-i2s-v2.c
diff --git
a/sound/soc/samsung/s3c-i2s-v2.c
b/sound/soc/samsung/s3c-i2s-v2.c
index bf8ae79b0fd2fcf9c9856de51e89a8183b9f847d..644f186fd35c4b62a5fa016407385352ae10d066 100644
(file)
--- a/
sound/soc/samsung/s3c-i2s-v2.c
+++ b/
sound/soc/samsung/s3c-i2s-v2.c
@@
-24,7
+24,6
@@
#include "regs-i2s-v2.h"
#include "s3c-i2s-v2.h"
#include "regs-i2s-v2.h"
#include "s3c-i2s-v2.h"
-#include "dma.h"
#undef S3C_IIS_V2_SUPPORTED
#undef S3C_IIS_V2_SUPPORTED
@@
-302,7
+301,7
@@
static int s3c_i2sv2_hw_params(struct snd_pcm_substream *substream,
struct snd_soc_dai *dai)
{
struct s3c_i2sv2_info *i2s = to_info(dai);
struct snd_soc_dai *dai)
{
struct s3c_i2sv2_info *i2s = to_info(dai);
- struct s
3c_dma_params
*dma_data;
+ struct s
nd_dmaengine_dai_dma_data
*dma_data;
u32 iismod;
pr_debug("Entered %s\n", __func__);
u32 iismod;
pr_debug("Entered %s\n", __func__);
This page took
0.028263 seconds
and
5
git commands to generate.