projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'driver-core-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...
[linux-2.6-block.git]
/
sound
/
soc
/
fsl
/
imx-ssi.c
diff --git
a/sound/soc/fsl/imx-ssi.c
b/sound/soc/fsl/imx-ssi.c
index 44313e47e254c5a47ae06393e525a9c122e427d2..fa801e17c51e6222abbbce12e40e5cc9f50a56c2 100644
(file)
--- a/
sound/soc/fsl/imx-ssi.c
+++ b/
sound/soc/fsl/imx-ssi.c
@@
-382,7
+382,7
@@
static struct snd_soc_dai_driver imx_ssi_dai = {
static struct snd_soc_dai_driver imx_ac97_dai = {
.probe = imx_ssi_dai_probe,
- .
ac97_control = 1
,
+ .
bus_control = true
,
.playback = {
.stream_name = "AC97 Playback",
.channels_min = 2,