Index: ioemu/Makefile.target
===================================================================
--- ioemu.orig/Makefile.target	2007-05-03 10:07:52.000000000 +0100
+++ ioemu/Makefile.target	2007-05-03 10:07:53.000000000 +0100
@@ -355,7 +355,7 @@
 ifeq ($(TARGET_BASE_ARCH), i386)
 # Hardware support
 VL_OBJS+= ide.o pckbd.o ps2.o vga.o $(SOUND_HW) dma.o $(AUDIODRV)
-VL_OBJS+= fdc.o mc146818rtc.o serial.o i8254.o pcspk.o pc.o
+VL_OBJS+= fdc.o mc146818rtc.o serial.o pc.o
 VL_OBJS+= cirrus_vga.o mixeng.o parallel.o acpi.o piix_pci.o
 VL_OBJS+= usb-uhci.o
 DEFINES += -DHAS_AUDIO
Index: ioemu/hw/pc.c
===================================================================
--- ioemu.orig/hw/pc.c	2007-05-03 10:07:52.000000000 +0100
+++ ioemu/hw/pc.c	2007-05-03 10:07:53.000000000 +0100
@@ -38,7 +38,9 @@
 
 static fdctrl_t *floppy_controller;
 static RTCState *rtc_state;
+#ifndef CONFIG_DM
 static PITState *pit;
+#endif /* !CONFIG_DM */
 #ifndef CONFIG_DM
 static IOAPICState *ioapic;
 #endif /* !CONFIG_DM */
@@ -810,8 +812,10 @@
     }
 #endif /* !CONFIG_DM */
     isa_pic = pic_init(pic_irq_request, first_cpu);
+#ifndef CONFIG_DM
     pit = pit_init(0x40, 0);
     pcspk_init(pit);
+#endif /* !CONFIG_DM */
 #ifndef CONFIG_DM
     if (pci_enabled) {
         pic_set_alt_irq_func(isa_pic, ioapic_set_irq, ioapic);
Index: ioemu/vl.c
===================================================================
--- ioemu.orig/vl.c	2007-05-03 10:07:53.000000000 +0100
+++ ioemu/vl.c	2007-05-03 10:07:53.000000000 +0100
@@ -5622,6 +5622,7 @@
 
 #ifdef HAS_AUDIO
 struct soundhw soundhw[] = {
+#ifndef CONFIG_DM
 #ifdef TARGET_I386
     {
         "pcspk",
@@ -5631,6 +5632,7 @@
         { .init_isa = pcspk_audio_init }
     },
 #endif
+#endif /* !CONFIG_DM */
     {
         "sb16",
         "Creative Sound Blaster 16",