linux-mips
[Top] [All Lists]

dec_esp.c needs merging with upstream

To: linux-mips@linux-mips.org
Subject: dec_esp.c needs merging with upstream
From: Martin Michlmayr <tbm@cyrius.com>
Date: Sun, 22 Jan 2006 13:31:47 +0000
Original-recipient: rfc822;linux-mips@linux-mips.org
Sender: linux-mips-bounce@linux-mips.org
User-agent: Mutt/1.5.11
Ralf,

In October 2005, Christoph Hellwig <hch@lst.de> removed the
Scsi_Host_Template typedef (d0be4a7d29ad0bd3ce2209dd9e46d410b632db59).
The converted dec_esp.c is in mainline git already but it seems you
ignored that change when you synced with mainline.  We need the
following patch:


--- a/drivers/scsi/dec_esp.c~   2006-01-22 13:14:35.000000000 +0000
+++ b/drivers/scsi/dec_esp.c    2006-01-22 13:19:03.000000000 +0000
@@ -98,7 +98,7 @@
 static irqreturn_t scsi_dma_err_int(int, void *, struct pt_regs *);
 static irqreturn_t scsi_dma_int(int, void *, struct pt_regs *);
 
-int dec_esp_detect(Scsi_Host_Template * tpnt);
+int dec_esp_detect(struct scsi_host_template * tpnt);
 
 static int dec_esp_release(struct Scsi_Host *shost)
 {
@@ -110,7 +110,7 @@
        return 0;
 }
 
-static Scsi_Host_Template driver_template = {
+static struct scsi_host_template driver_template = {
        .proc_name              = "dec_esp",
        .proc_info              = &esp_proc_info,
        .name                   = "NCR53C94",


See
http://www.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=history;h=3ee68c4af3fd7228c1be63254b9f884614f9ebb2;f=drivers/scsi/dec_esp.c

-- 
Martin Michlmayr
http://www.cyrius.com/

<Prev in Thread] Current Thread [Next in Thread>
  • dec_esp.c needs merging with upstream, Martin Michlmayr <=