summary refs log tree commit diff stats
path: root/audio/ossaudio.c
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2016-05-19 09:27:28 +0100
committerPeter Maydell <peter.maydell@linaro.org>2016-05-19 09:27:28 +0100
commit8ec4fe0a4bed4fa27e6f28a746bcf77b27cd05a3 (patch)
tree93a1691d7a5d90ddbb77a3210299089fcede4947 /audio/ossaudio.c
parenta257c741491ff1c3c192d13a89c136dd6401c54d (diff)
parentcb8d4c8f54b8271f642f02382eec29d468bb1c77 (diff)
downloadfocaccia-qemu-8ec4fe0a4bed4fa27e6f28a746bcf77b27cd05a3.tar.gz
focaccia-qemu-8ec4fe0a4bed4fa27e6f28a746bcf77b27cd05a3.zip
Merge remote-tracking branch 'remotes/mjt/tags/pull-trivial-patches-2016-05-18' into staging
trivial patches for 2016-05-18

# gpg: Signature made Wed 18 May 2016 13:04:43 BST using RSA key ID A4C3D7DB
# gpg: Good signature from "Michael Tokarev <mjt@tls.msk.ru>"
# gpg:                 aka "Michael Tokarev <mjt@corpit.ru>"
# gpg:                 aka "Michael Tokarev <mjt@debian.org>"

* remotes/mjt/tags/pull-trivial-patches-2016-05-18:
  Fix some typos found by codespell
  9p: drop unused declaration from coth.h
  smbios: fix typo
  accel: make configure_accelerator return void
  configure: Use uniform description for devel packages
  ipack: Update e-mail address
  util: fix comment typos
  qdict: fix unbounded stack warning for qdict_array_entries
  Fix typo in variable name (found and fixed by codespell)
  vl: fix comment about when parsing cpu definitions
  loader: fix potential memory leak
  remove comment for nonexistent structure member
  s390: remove misleading comment

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'audio/ossaudio.c')
-rw-r--r--audio/ossaudio.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/audio/ossaudio.c b/audio/ossaudio.c
index 349e9dd53d..a0d9cda1ec 100644
--- a/audio/ossaudio.c
+++ b/audio/ossaudio.c
@@ -898,7 +898,7 @@ static struct audio_option oss_options[] = {
         .name  = "EXCLUSIVE",
         .tag   = AUD_OPT_BOOL,
         .valp  = &glob_conf.exclusive,
-        .descr = "Open device in exclusive mode (vmix wont work)"
+        .descr = "Open device in exclusive mode (vmix won't work)"
     },
 #ifdef USE_DSP_POLICY
     {