diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2012-02-27 11:19:27 -0600 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-02-27 11:19:27 -0600 |
| commit | b55c952aea6de024bf1a06357b49367fba045443 (patch) | |
| tree | 63574bbaa02ba71451712908253280a8a9ef8c22 /Makefile | |
| parent | 90d7416ab13113ccd3891435eea8715c5f503460 (diff) | |
| parent | 67d6fa53629f1eb3401974d740310c10e03fa1c9 (diff) | |
Merge remote-tracking branch 'aneesh/for-upstream' into staging
* aneesh/for-upstream:
hw/9pfs: Endian fixes for virtfs
./configure: add option for disabling VirtFS
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -40,7 +40,9 @@ HELPERS-$(CONFIG_LINUX) = qemu-bridge-helper$(EXESUF) ifdef BUILD_DOCS DOCS=qemu-doc.html qemu-tech.html qemu.1 qemu-img.1 qemu-nbd.8 QMP/qmp-commands.txt +ifdef CONFIG_VIRTFS DOCS+=fsdev/virtfs-proxy-helper.1 +endif else DOCS= endif |