diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2010-07-06 10:48:01 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2010-07-06 10:48:01 -0500 |
| commit | 5efb397f877fc3002c8bc764f4656f4761bd965d (patch) | |
| tree | 4ef1809f16a7f30f237840cdbfc5521afd4e8316 /Makefile.objs | |
| parent | fb787f81e749fde8c74548f9db1472eb321b9a0c (diff) | |
| parent | 33b1db1c8888b77e06c720ebef0482ed598eb384 (diff) | |
Merge remote branch 'kwolf/for-anthony' 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 55417c9941..67f1b215b1 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -14,7 +14,7 @@ block-obj-$(CONFIG_LINUX_AIO) += linux-aio.o block-nested-y += raw.o cow.o qcow.o vdi.o vmdk.o cloop.o dmg.o bochs.o vpc.o vvfat.o block-nested-y += qcow2.o qcow2-refcount.o qcow2-cluster.o qcow2-snapshot.o -block-nested-y += parallels.o nbd.o blkdebug.o +block-nested-y += parallels.o nbd.o blkdebug.o sheepdog.o block-nested-$(CONFIG_WIN32) += raw-win32.o block-nested-$(CONFIG_POSIX) += raw-posix.o block-nested-$(CONFIG_CURL) += curl.o |