diff options
author | Anthony Liguori <aliguori@us.ibm.com> | 2013-05-13 09:44:25 -0500 |
---|---|---|
committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-05-13 09:44:25 -0500 |
commit | f6e136e47a6adc176cb53a24cf5a515ca09f977f (patch) | |
tree | 6ba37c38ba2dd0af4a3f889f7c1f9e88c609f984 /qemu-doc.texi | |
parent | 879367efba1f2e9733ff76d03041324b5b76f645 (diff) | |
parent | 98b2d199c109c9eabebb70965db0ae24f3f75a79 (diff) | |
download | qemu-f6e136e47a6adc176cb53a24cf5a515ca09f977f.tar.gz |
Merge remote-tracking branch 'mjt/trivial-patches-next' into staging
# By Dong Xu Wang (2) and others
# Via Michael Tokarev
* mjt/trivial-patches-next:
osdep.h: include sys/types.h for ssize_t definition
remove double semicolons
clean unnecessary code: don't check g_strdup arg for NULL
docs: mention AddressSpaces in docs/memory.txt
audio: update documentation after removing --audio-card-list option
m25p80.c: Sync Flash chip list with Linux
bsd-user: OS-agnostic 64-bit SYSCTL types
Message-id: 518F61B9.9050803@msgid.tls.msk.ru
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'qemu-doc.texi')
-rw-r--r-- | qemu-doc.texi | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/qemu-doc.texi b/qemu-doc.texi index 64493ebfce..5fc0eae400 100644 --- a/qemu-doc.texi +++ b/qemu-doc.texi @@ -214,10 +214,6 @@ PCI UHCI USB controller and a virtual USB hub. SMP is supported with up to 255 CPUs. -Note that adlib, gus and cs4231a are only available when QEMU was -configured with --audio-card-list option containing the name(s) of -required card(s). - QEMU uses the PC BIOS from the Bochs project and the Plex86/Bochs LGPL VGA BIOS. |