aboutsummaryrefslogtreecommitdiff
path: root/hw/pc.c
diff options
context:
space:
mode:
authorbellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162>2004-11-07 18:04:02 +0000
committerbellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162>2004-11-07 18:04:02 +0000
commit85571bc7415c3fa9390f5edc3720ec7975219a68 (patch)
treea3f74af6eb70e978bd43613bad35592b833ec6e5 /hw/pc.c
parent8f46820d920b9cd149559b5d32e6b306ee2e24ba (diff)
downloadqemu-85571bc7415c3fa9390f5edc3720ec7975219a68.zip
qemu-85571bc7415c3fa9390f5edc3720ec7975219a68.tar.gz
qemu-85571bc7415c3fa9390f5edc3720ec7975219a68.tar.bz2
audio merge (malc)
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1125 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'hw/pc.c')
-rw-r--r--hw/pc.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/hw/pc.c b/hw/pc.c
index cddd136..fbcd969 100644
--- a/hw/pc.c
+++ b/hw/pc.c
@@ -554,13 +554,10 @@ void pc_init(int ram_size, int vga_ram_size, int boot_device,
kbd_init();
DMA_init(0);
-#ifndef _WIN32
if (audio_enabled) {
/* no audio supported yet for win32 */
AUD_init();
- SB16_init();
}
-#endif
floppy_controller = fdctrl_init(6, 2, 0, 0x3f0, fd_table);