diff options
| author | Marcelo Tosatti <mtosatti@redhat.com> | 2011-03-14 22:36:27 -0300 |
|---|---|---|
| committer | Marcelo Tosatti <mtosatti@redhat.com> | 2011-03-14 22:36:27 -0300 |
| commit | 0836b77f0f65d56d08bdeffbac25cd6d78267dc9 (patch) | |
| tree | b35c31880ffe80da4c1e8235f66fca996e895a59 /Makefile.target | |
| parent | ac166344df588a0fa455eb18ff4d083f709a8685 (diff) | |
| parent | 64d7e9a421fea0ac50b44541f5521de455e7cd5d (diff) | |
Merge commit '64d7e9a421fea0ac50b44541f5521de455e7cd5d' into upstream-merge
* commit '64d7e9a421fea0ac50b44541f5521de455e7cd5d':
i8254: convert to qdev
vga-isa: make optional
vga-isa: convert to qdev
applesmc: make optional
fdc: make optional
fdc: refactor device creation
fdc: use FDriveType for floppy drive type
fdc: move floppy geometry guessing to block.c
serial: make optional
serial: refactor device creation
ne2000_isa: make optional
ne2000_isa: refactor device creation
parallel: make optional
parallel: refactor device creation
Conflicts:
hw/i8254.c
hw/pc.c
Diffstat (limited to 'Makefile.target')
| -rw-r--r-- | Makefile.target | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.target b/Makefile.target index 23367eb60..715b2c47f 100644 --- a/Makefile.target +++ b/Makefile.target @@ -225,7 +225,7 @@ obj-$(CONFIG_KVM) += ivshmem.o obj-i386-y += vga.o obj-i386-y += mc146818rtc.o i8259.o pc.o obj-i386-y += cirrus_vga.o apic.o ioapic.o piix_pci.o -obj-i386-y += vmport.o applesmc.o +obj-i386-y += vmport.o obj-i386-y += device-hotplug.o pci-hotplug.o smbios.o wdt_ib700.o obj-i386-y += extboot.o obj-i386-y += debugcon.o multiboot.o |