diff options
| author | Aurelien Jarno <aurelien@aurel32.net> | 2012-01-10 18:24:11 +0100 |
|---|---|---|
| committer | Aurelien Jarno <aurelien@aurel32.net> | 2012-01-10 18:24:11 +0100 |
| commit | 14763ec87340322eba5fe4be35a2c8790c0d1b94 (patch) | |
| tree | 65b677bb455823d0714d50105e0d4bfcaffc7d1e /Makefile.target | |
| parent | 665a04ae1cbfa8004a38cf0fe99ba799c978a1fe (diff) | |
| parent | 93116ac0cf9734e7b28886aedf03848b37d6785e (diff) | |
| download | qemu-14763ec87340322eba5fe4be35a2c8790c0d1b94.zip qemu-14763ec87340322eba5fe4be35a2c8790c0d1b94.tar.gz qemu-14763ec87340322eba5fe4be35a2c8790c0d1b94.tar.bz2 | |
Merge branch 's390-next' of git://repo.or.cz/qemu/agraf
* 's390-next' of git://repo.or.cz/qemu/agraf:
s390: fix cpu hotplug / cpu activity on interrupts
s390x: add TR function for EXECUTE
Expose drive_add on all architectures
Add generic drive hotplugging
Compile device-hotplug on all targets
[S390] Add hotplug support
Diffstat (limited to 'Makefile.target')
| -rw-r--r-- | Makefile.target | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Makefile.target b/Makefile.target index 18be624..06d79b8 100644 --- a/Makefile.target +++ b/Makefile.target @@ -220,12 +220,15 @@ ifeq ($(CONFIG_KVM), y) endif obj-$(CONFIG_IVSHMEM) += ivshmem.o +# Generic hotplugging +obj-y += device-hotplug.o + # Hardware support obj-i386-y += vga.o obj-i386-y += mc146818rtc.o pc.o obj-i386-y += cirrus_vga.o sga.o apic.o ioapic.o piix_pci.o obj-i386-y += vmport.o -obj-i386-y += device-hotplug.o pci-hotplug.o smbios.o wdt_ib700.o +obj-i386-y += pci-hotplug.o smbios.o wdt_ib700.o obj-i386-y += debugcon.o multiboot.o obj-i386-y += pc_piix.o obj-i386-$(CONFIG_KVM) += kvmclock.o |