diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2011-02-16 08:47:07 -0600 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-02-16 08:47:07 -0600 |
| commit | c5d69e6bbf37bf5e3882060764b15e018e6a5321 (patch) | |
| tree | e246e96bdfffbc5e07682c5a39ea7a65482a5935 /Makefile.objs | |
| parent | 630ecca0da959e65acad1ee0bf3a631bbb7ee052 (diff) | |
| parent | 0ec329dab938e2d97d12a91f8ed15fec27b325e0 (diff) | |
Merge remote branch 'qemu-kvm/uq/master' 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 adb584234e..b21f9d3894 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -141,7 +141,7 @@ common-obj-y += $(addprefix ui/, $(ui-obj-y)) common-obj-y += iov.o acl.o common-obj-$(CONFIG_THREAD) += qemu-thread.o -common-obj-$(CONFIG_IOTHREAD) += compatfd.o +common-obj-$(CONFIG_POSIX) += compatfd.o common-obj-y += notify.o event_notifier.o common-obj-y += qemu-timer.o qemu-timer-common.o |