---
 drivers/scsi/Makefile  |    2 +-
 drivers/scsi/blz2060.c |    9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

--- a/drivers/scsi/Makefile
+++ b/drivers/scsi/Makefile
@@ -47,7 +47,7 @@ obj-$(CONFIG_MVME147_SCSI)	+= mvme147.o	
 obj-$(CONFIG_SGIWD93_SCSI)	+= sgiwd93.o	wd33c93.o
 obj-$(CONFIG_CYBERSTORM_SCSI)	+= NCR53C9x.o	cyberstorm.o
 obj-$(CONFIG_CYBERSTORMII_SCSI)	+= NCR53C9x.o	cyberstormII.o
-obj-$(CONFIG_BLZ2060_SCSI)	+= NCR53C9x.o	blz2060.o
+obj-$(CONFIG_BLZ2060_SCSI)	+= esp_scsi.o	blz2060.o
 obj-$(CONFIG_BLZ1230_SCSI)	+= NCR53C9x.o	blz1230.o
 obj-$(CONFIG_FASTLANE_SCSI)	+= NCR53C9x.o	fastlane.o
 obj-$(CONFIG_OKTAGON_SCSI)	+= NCR53C9x.o	oktagon_esp_mod.o
--- a/drivers/scsi/blz2060.c
+++ b/drivers/scsi/blz2060.c
@@ -29,7 +29,7 @@
 
 #include "scsi.h"
 #include <scsi/scsi_host.h>
-#include "NCR53C9x.h"
+#include "esp_scsi.h"
 
 #include <linux/zorro.h>
 #include <asm/irq.h>
@@ -71,7 +71,7 @@ struct blz2060_dma_registers {
 #define BLZ2060_DMA_LED    0x02		/* HD led control 1 = off */
 
 static int  dma_bytes_sent(struct NCR_ESP *esp, int fifo_count);
-static int  dma_can_transfer(struct NCR_ESP *esp, Scsi_Cmnd *sp);
+static int  dma_can_transfer(struct NCR_ESP *esp, struct scsi_cmnd *sp);
 static void dma_dump_state(struct NCR_ESP *esp);
 static void dma_init_read(struct NCR_ESP *esp, __u32 addr, int length);
 static void dma_init_write(struct NCR_ESP *esp, __u32 addr, int length);
@@ -96,10 +96,11 @@ int __init blz2060_esp_detect(struct scs
 	struct zorro_dev *z = NULL;
 	unsigned long address;
 
+#warning New style Zorro driver
 	if ((z = zorro_find_device(ZORRO_PROD_PHASE5_BLIZZARD_2060, z))) {
 	    unsigned long board = z->resource.start;
 	    if (request_mem_region(board+BLZ2060_ESP_ADDR,
-				   sizeof(struct ESP_regs), "NCR53C9x")) {
+				   sizeof(struct ESP_regs), "esp-blz2060")) {
 		esp = esp_allocate(tpnt, (void *)board + BLZ2060_ESP_ADDR, 0);
 
 		/* Do command transfer with programmed I/O */
@@ -176,7 +177,7 @@ static int dma_bytes_sent(struct NCR_ESP
 	return fifo_count;
 }
 
-static int dma_can_transfer(struct NCR_ESP *esp, Scsi_Cmnd *sp)
+static int dma_can_transfer(struct NCR_ESP *esp, struct scsi_cmnd *sp)
 {
 	/* I don't think there's any limit on the Blizzard DMA. So we use what
 	 * the ESP chip can handle (24 bit).