diff options
| author | bellard | 2005-10-30 19:58:22 +0100 |
|---|---|---|
| committer | bellard | 2005-10-30 19:58:22 +0100 |
| commit | 1d14ffa97eacd3cb722271eaf6f093038396eac4 (patch) | |
| tree | 1aae1f090262c3642cc672971890141050413d26 /hw/pc.c | |
| parent | OS X: support for the built in CD-ROM drive (Mike Kronenberg) (diff) | |
| download | qemu-1d14ffa97eacd3cb722271eaf6f093038396eac4.tar.gz qemu-1d14ffa97eacd3cb722271eaf6f093038396eac4.tar.xz qemu-1d14ffa97eacd3cb722271eaf6f093038396eac4.zip | |
merged 15a_aqemu.patch audio patch (malc)
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1584 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'hw/pc.c')
| -rw-r--r-- | hw/pc.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -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); |