patch-2.2.6 linux/drivers/scsi/megaraid.c

Next file: linux/drivers/scsi/megaraid.h
Previous file: linux/drivers/scsi/hosts.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.2.5/linux/drivers/scsi/megaraid.c linux/drivers/scsi/megaraid.c
@@ -114,7 +114,6 @@
 #include <linux/sched.h>
 #include <linux/stat.h>
 #include <linux/malloc.h>	/* for kmalloc() */
-#include <linux/config.h>	/* for CONFIG_PCI */
 #if LINUX_VERSION_CODE < 0x20100
 #include <linux/bios32.h>
 #else
@@ -884,7 +883,7 @@
 
   spin_lock_irqsave(&mega_lock,flags);
 
-#if !MULTI_IO
+#ifndef CONFIG_MEGARAID_MULTI_IO
   if (megaCfg->flag & PENDING) {
      spin_unlock_irqrestore(&mega_lock,flags);
      return -1;

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)