linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Mikael Pettersson <mikpe@csd.uu.se>
To: ipslinux@adaptec.com, marcelo.tosatti@cyclades.com
Cc: linux-kernel@vger.kernel.org
Subject: [PATCH][2.4.28-pre3] ips scsi driver compile failure fix
Date: Sun, 12 Sep 2004 13:20:30 +0200 (MEST)	[thread overview]
Message-ID: <200409121120.i8CBKU3o015140@harpo.it.uu.se> (raw)

drivers/scsi/ips.c fails to compile in the 2.4.28-pre3 kernel:

In file included from ips.c:190:
ips.h:101: error: redefinition of typedef 'irqreturn_t'
/tmp/linux-2.4.28-pre3/include/linux/interrupt.h:16: error: previous declaration of 'irqreturn_t' was here

The irqreturn_t etc compat definitions in ips.h are in conflict
with the compat definitions in interrupt.h, added in kernel 2.4.23.
The patch below fixes the issue for me.

/Mikael

--- linux-2.4.28-pre3/drivers/scsi/ips.h.~1~	2004-09-12 00:23:20.000000000 +0200
+++ linux-2.4.28-pre3/drivers/scsi/ips.h	2004-09-12 02:09:04.000000000 +0200
@@ -97,13 +97,13 @@
 
    #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
    
-      #ifndef irqreturn_t
+      #if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,23)
          typedef void irqreturn_t;
+         #define IRQ_NONE
+         #define IRQ_HANDLED
+         #define IRQ_RETVAL(x)
       #endif 
       
-      #define IRQ_NONE
-      #define IRQ_HANDLED
-      #define IRQ_RETVAL(x)
       #define IPS_REGISTER_HOSTS(SHT)      scsi_register_module(MODULE_SCSI_HA,SHT)
       #define IPS_UNREGISTER_HOSTS(SHT)    scsi_unregister_module(MODULE_SCSI_HA,SHT)
       #define IPS_ADD_HOST(shost,device)

                 reply	other threads:[~2004-09-12 11:22 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=200409121120.i8CBKU3o015140@harpo.it.uu.se \
    --to=mikpe@csd.uu.se \
    --cc=ipslinux@adaptec.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=marcelo.tosatti@cyclades.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).