diff options
author | Anthony Liguori <aliguori@us.ibm.com> | 2011-10-31 11:09:00 -0500 |
---|---|---|
committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-10-31 11:09:00 -0500 |
commit | 8494a397b68124f9898e7912173d460ee99ba3e2 (patch) | |
tree | 2c3ff12f56cb2587d00bab448a226d3cf0042d64 /Makefile.objs | |
parent | d439b79d730bf219e47c14ab94f1546bcc5045ab (diff) | |
parent | 336a6915bc7089fb20fea4ba99972ad9a97c5f52 (diff) | |
download | qemu-8494a397b68124f9898e7912173d460ee99ba3e2.zip qemu-8494a397b68124f9898e7912173d460ee99ba3e2.tar.gz qemu-8494a397b68124f9898e7912173d460ee99ba3e2.tar.bz2 |
Merge remote-tracking branch 'kwolf/for-anthony' into staging
Conflicts:
block/vmdk.c
Diffstat (limited to 'Makefile.objs')
-rw-r--r-- | Makefile.objs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Makefile.objs b/Makefile.objs index 31c8cc7..d7a6539 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -36,6 +36,7 @@ block-nested-y += qed-check.o block-nested-y += parallels.o nbd.o blkdebug.o sheepdog.o blkverify.o block-nested-$(CONFIG_WIN32) += raw-win32.o block-nested-$(CONFIG_POSIX) += raw-posix.o +block-nested-$(CONFIG_LIBISCSI) += iscsi.o block-nested-$(CONFIG_CURL) += curl.o block-nested-$(CONFIG_RBD) += rbd.o |