diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-03-15 07:37:22 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-03-15 07:37:22 +0100 |
| commit | 828006de1bddf83b6ecf03ec459c15f7c7c22db7 (patch) | |
| tree | 73a224bf0371b41c9777c2bad8169ed50bcca879 /include/sound | |
| parent | d0f47ff17f29740eabbd64e11705b7332241714c (diff) | |
| parent | 5ec65ee589fdaca7298b6303fd74ad6c121a8f38 (diff) | |
| download | linux-3.10-828006de1bddf83b6ecf03ec459c15f7c7c22db7.tar.gz linux-3.10-828006de1bddf83b6ecf03ec459c15f7c7c22db7.tar.bz2 linux-3.10-828006de1bddf83b6ecf03ec459c15f7c7c22db7.zip | |
Merge tag 'asoc-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into topic/asoc
Linus decided to go for another week so here's a few more updates - a
mixed bag here, a few minor diagnostic tweaks, some driver enhancements
and the dmaengine conversion for ep93xx drivers which was tested a while
ago and just waiting for a signoff.
Diffstat (limited to 'include/sound')
| -rw-r--r-- | include/sound/soc.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/sound/soc.h b/include/sound/soc.h index 82bd773f8ab..2ebf7877c14 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -718,6 +718,7 @@ struct snd_soc_platform { int id; struct device *dev; struct snd_soc_platform_driver *driver; + struct mutex mutex; unsigned int suspended:1; /* platform is suspended */ unsigned int probed:1; |