2004-09-13 18:02:10

by Hammer, Jack

[permalink] [raw]
Subject: 2.4.28-pre3: broken ips update


This patch replaces the patch I submitted ( and then rescinded ) earlier
today. It fixes the compilation problem in 2.4.28 and includes the
changes recommended by Arjan on my earlier proposal for this.

Jack




--- linux.orig/drivers/scsi/ips.h Mon Sep 13 12:51:04 2004
+++ linux/drivers/scsi/ips.h Mon Sep 13 12:55:15 2004
@@ -95,15 +95,14 @@
#define scsi_set_pci_device(sh,dev) (0)
#endif

- #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-
- #ifndef irqreturn_t
- typedef void irqreturn_t;
- #endif
-
+ #ifndef IRQ_NONE
+ typedef void irqreturn_t;
#define IRQ_NONE
#define IRQ_HANDLED
#define IRQ_RETVAL(x)
+ #endif
+
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
#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)