Merge commit 'gnu/master' into test

[qemu] / hw / scsi.h

diff --git a/hw/scsi.h b/hw/scsi.h
index 78ae768..369998f 100644 (file)
--- a/hw/scsi.h
+++ b/hw/scsi.h
@@ -1,8 +1,7 @@
 /* esp.c */
 #define ESP_MAX_DEVS 7
 typedef void (*espdma_memory_read_write)(void *opaque, uint8_t *buf, int len);
-void esp_scsi_attach(void *opaque, BlockDriverState *bd, int id);
-void *esp_init(target_phys_addr_t espaddr, int it_shift,
-               espdma_memory_read_write dma_memory_read,
-               espdma_memory_read_write dma_memory_write,
-               void *dma_opaque, qemu_irq irq, qemu_irq *reset);
+void esp_init(target_phys_addr_t espaddr, int it_shift,
+              espdma_memory_read_write dma_memory_read,
+              espdma_memory_read_write dma_memory_write,
+              void *dma_opaque, qemu_irq irq, qemu_irq *reset);