From 1d14ffa97eacd3cb722271eaf6f093038396eac4 Mon Sep 17 00:00:00 2001
From: bellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162>
Date: Sun, 30 Oct 2005 18:58:22 +0000
Subject: merged 15a_aqemu.patch audio patch (malc)

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1584 c046a42c-6fe2-441c-8c8c-71466251a162
---
 hw/pc.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'hw/pc.c')

diff --git a/hw/pc.c b/hw/pc.c
index f0ae1b9..ad3d5e0 100644
--- a/hw/pc.c
+++ b/hw/pc.c
@@ -602,18 +602,18 @@ static void pc_init1(int ram_size, int vga_ram_size, int boot_device,
 
     if (audio_enabled) {
         AUD_init();
-#ifdef USE_SB16
         if (sb16_enabled)
             SB16_init ();
-#endif
 #ifdef CONFIG_ADLIB
         if (adlib_enabled)
             Adlib_init ();
 #endif
-#ifdef USE_GUS
+#ifdef CONFIG_GUS
         if (gus_enabled)
             GUS_init ();
 #endif
+        if (pci_enabled && es1370_enabled)
+            es1370_init (pci_bus);
     }
 
     floppy_controller = fdctrl_init(6, 2, 0, 0x3f0, fd_table);
-- 
cgit v1.1