aboutsummaryrefslogtreecommitdiff
path: root/hw/pc_piix.c
diff options
context:
space:
mode:
authorIsaku Yamahata <yamahata@valinux.co.jp>2011-01-21 19:53:45 +0900
committerAurelien Jarno <aurelien@aurel32.net>2011-01-25 09:18:00 +0100
commit0dfa5ef90d0b4eebaf810a897459a009e4b1cef2 (patch)
treec1a786583824fb1f382eda76db648bca988a3461 /hw/pc_piix.c
parentbec43cc3b61d025841d550800d3835986446061d (diff)
audio: consolidate audio_init()
consolidate audio_init() and remove references to shoundhw. Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp> Acked-by: Blue Swirl <blauwirbel@gmail.com> Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
Diffstat (limited to 'hw/pc_piix.c')
-rw-r--r--hw/pc_piix.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/hw/pc_piix.c b/hw/pc_piix.c
index f82508d92f..7b744730f7 100644
--- a/hw/pc_piix.c
+++ b/hw/pc_piix.c
@@ -34,6 +34,7 @@
#include "kvm.h"
#include "sysemu.h"
#include "sysbus.h"
+#include "arch_init.h"
#include "blockdev.h"
#define MAX_IDE_BUS 2
@@ -148,7 +149,7 @@ static void pc_init1(ram_addr_t ram_size,
}
}
- pc_audio_init(pci_enabled ? pci_bus : NULL, isa_irq);
+ audio_init(isa_irq, pci_enabled ? pci_bus : NULL);
pc_cmos_init(below_4g_mem_size, above_4g_mem_size, boot_device,
idebus[0], idebus[1], floppy_controller, rtc_state);