projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'asoc-v4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound...
[cascardo/linux.git]
/
sound
/
soc
/
samsung
/
s3c-i2s-v2.h
diff --git
a/sound/soc/samsung/s3c-i2s-v2.h
b/sound/soc/samsung/s3c-i2s-v2.h
index
d068414
..
182d805
100644
(file)
--- a/
sound/soc/samsung/s3c-i2s-v2.h
+++ b/
sound/soc/samsung/s3c-i2s-v2.h
@@
-60,8
+60,8
@@
struct s3c_i2sv2_info {
unsigned char master;
- struct s
3c_dma_params
*dma_playback;
- struct s
3c_dma_params
*dma_capture;
+ struct s
nd_dmaengine_dai_dma_data
*dma_playback;
+ struct s
nd_dmaengine_dai_dma_data
*dma_capture;
u32 suspend_iismod;
u32 suspend_iiscon;