projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'timers/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[cascardo/linux.git]
/
sound
/
soc
/
davinci
/
davinci-pcm.c
diff --git
a/sound/soc/davinci/davinci-pcm.c
b/sound/soc/davinci/davinci-pcm.c
index
6a76927
..
6a5e56a
100644
(file)
--- a/
sound/soc/davinci/davinci-pcm.c
+++ b/
sound/soc/davinci/davinci-pcm.c
@@
-350,7
+350,7
@@
static void davinci_pcm_free(struct snd_pcm *pcm)
static u64 davinci_pcm_dmamask = 0xffffffff;
static int davinci_pcm_new(struct snd_card *card,
- struct snd_soc_
codec_
dai *dai, struct snd_pcm *pcm)
+ struct snd_soc_dai *dai, struct snd_pcm *pcm)
{
int ret;