summaryrefslogtreecommitdiff
path: root/vl.c
diff options
context:
space:
mode:
authoraurel32 <aurel32@c046a42c-6fe2-441c-8c8c-71466251a162>2008-04-07 19:47:14 +0000
committeraurel32 <aurel32@c046a42c-6fe2-441c-8c8c-71466251a162>2008-04-07 19:47:14 +0000
commit4ce7ff6e68e9a13ff7da67d00cfc19e64e7aaef0 (patch)
treefe42c7c7977722d8e6217cdeaeba76079e4237f2 /vl.c
parentb60aee00276c1a1da76ac8ca6eb46da9696697e8 (diff)
downloadqemu-4ce7ff6e68e9a13ff7da67d00cfc19e64e7aaef0.tar.gz
MIPS Magnum R4000 machine
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4164 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'vl.c')
-rw-r--r--vl.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/vl.c b/vl.c
index 318eb35b2f..0a10ea147b 100644
--- a/vl.c
+++ b/vl.c
@@ -26,7 +26,6 @@
#include "hw/usb.h"
#include "hw/pcmcia.h"
#include "hw/pc.h"
-#include "hw/fdc.h"
#include "hw/audiodev.h"
#include "hw/isa.h"
#include "net.h"
@@ -8002,6 +8001,7 @@ static void register_machines(void)
qemu_register_machine(&taihu_machine);
#elif defined(TARGET_MIPS)
qemu_register_machine(&mips_machine);
+ qemu_register_machine(&mips_magnum_machine);
qemu_register_machine(&mips_malta_machine);
qemu_register_machine(&mips_pica61_machine);
qemu_register_machine(&mips_mipssim_machine);
@@ -8056,7 +8056,7 @@ static void register_machines(void)
#ifdef HAS_AUDIO
struct soundhw soundhw[] = {
#ifdef HAS_AUDIO_CHOICE
-#ifdef TARGET_I386
+#if defined(TARGET_I386) || defined(TARGET_MIPS)
{
"pcspk",
"PC speaker",