Merge master.kernel.org:/pub/scm/linux/kernel/git/acme/net-2.6

[linux-2.6] / drivers / scsi / sun3x_esp.c

diff --git a/drivers/scsi/sun3x_esp.c b/drivers/scsi/sun3x_esp.c
index 6b60536ac92b4bb11278eb2f8b9ae37519f649e4..1bc41907a03817c206db14357ccf11976a2843a6 100644 (file)
--- a/drivers/scsi/sun3x_esp.c
+++ b/drivers/scsi/sun3x_esp.c
@@ -53,7 +53,7 @@ int sun3x_esp_detect(struct scsi_host_template *tpnt)
        struct ConfigDev *esp_dev;
 
        esp_dev = 0;
-       esp = esp_allocate(tpnt, (void *) esp_dev);
+       esp = esp_allocate(tpnt, esp_dev, 0);
 
        /* Do command transfer with DMA */
        esp->do_pio_cmds = 0;
@@ -332,8 +332,8 @@ static void dma_mmu_get_scsi_sgl (struct NCR_ESP *esp, Scsi_Cmnd *sp)
     struct scatterlist *sg = sp->SCp.buffer;
 
     while (sz >= 0) {
-           sg[sz].dma_address = dvma_map((unsigned long)page_address(sg[sz].page) +
-                                          sg[sz].offset, sg[sz].length);
+           sg[sz].dma_address = dvma_map((unsigned long)sg_virt(&sg[sz]),
+                                         sg[sz].length);
            sz--;
     }
     sp->SCp.ptr=(char *)((unsigned long)sp->SCp.buffer->dma_address);