diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2011-10-14 10:44:52 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-10-14 10:44:52 -0500 |
| commit | 36f490b176afab3096e9c2877b365354f67e269d (patch) | |
| tree | b99964fa0e30e9a7931c4944cd1897f8f735aee3 /Makefile.objs | |
| parent | ebffe2afceb1a17b5d134b5debf553955fe5ea1a (diff) | |
| parent | 0d9595245393f6e59831447a06235a0a1b2cdfd4 (diff) | |
| download | qemu-36f490b176afab3096e9c2877b365354f67e269d.zip qemu-36f490b176afab3096e9c2877b365354f67e269d.tar.gz qemu-36f490b176afab3096e9c2877b365354f67e269d.tar.bz2 | |
Merge remote-tracking branch 'qemu-kvm-tmp/memory/batch' into staging
Diffstat (limited to 'Makefile.objs')
| -rw-r--r-- | Makefile.objs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.objs b/Makefile.objs index 7b0739c..6424efd 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -82,7 +82,7 @@ common-obj-$(CONFIG_WIN32) += os-win32.o common-obj-$(CONFIG_POSIX) += os-posix.o common-obj-y += tcg-runtime.o host-utils.o -common-obj-y += irq.o ioport.o input.o +common-obj-y += irq.o input.o common-obj-$(CONFIG_PTIMER) += ptimer.o common-obj-$(CONFIG_MAX7310) += max7310.o common-obj-$(CONFIG_WM8750) += wm8750.o |