Merge commit 'gnu/master' into test

[qemu] / hw / virtio-blk.h

diff --git a/hw/virtio-blk.h b/hw/virtio-blk.h
index 5ef6c36..dff3e0c 100644 (file)
--- a/hw/virtio-blk.h
+++ b/hw/virtio-blk.h
@@ -16,7 +16,6 @@
 
 #include "virtio.h"
 #include "block.h"
-#include "pci.h"
 
 /* from Linux's linux/virtio_blk.h */
 
@@ -82,6 +81,4 @@ struct virtio_scsi_inhdr
     uint32_t residual;
 };
 
-void *virtio_blk_init(PCIBus *bus, BlockDriverState *bs);
-
 #endif