Merge remote-tracking branch 'mdroth/qga-pull-5-29-12-v2' into staging

[qemu.git] / arch_init.h

diff --git a/arch_init.h b/arch_init.h
index 074f02a8cdf205519aa4f66218388610c5c5ed6a..c7cb94a932912d28d2ef7a302e66b8d7aa37542d 100644 (file)
--- a/arch_init.h
+++ b/arch_init.h
@@ -1,8 +1,6 @@
 #ifndef QEMU_ARCH_INIT_H
 #define QEMU_ARCH_INIT_H
 
-extern const char arch_config_name[];
-
 enum {
     QEMU_ARCH_ALL = -1,
     QEMU_ARCH_ALPHA = 1,
@@ -27,7 +25,7 @@ void do_acpitable_option(const char *optarg);
 void do_smbios_option(const char *optarg);
 void cpudef_init(void);
 int audio_available(void);
-void audio_init(ISABus *isa_bus, qemu_irq *isa_pic, PCIBus *pci_bus);
+void audio_init(ISABus *isa_bus, PCIBus *pci_bus);
 int tcg_available(void);
 int kvm_available(void);
 int xen_available(void);