[patch] 2.4.21-rc2-ac1: compile error with both AMI Megaraid drivers

From: Adrian Bunk (bunk@fs.tum.de)
Date: Sun May 11 2003 - 09:20:05 EST

On Sat, May 10, 2003 at 10:12:03AM -0400, Alan Cox wrote:
>...
> Linux 2.4.21rc1-ac4
>...
> o Merge new AMI Megaraid driver as megaraid2 (Atul Mukker)
>...

This fails when trying to build both AMI Megaraid drivers statically
into the kernel.

The following patch fixes it:

--- linux-2.4.21-rc2-ac1-full/drivers/scsi/Config.in.old 2003-05-11 16:14:23.000000000 +0200
+++ linux-2.4.21-rc2-ac1-full/drivers/scsi/Config.in 2003-05-11 16:15:42.000000000 +0200
@@ -66,7 +66,9 @@
 dep_tristate 'Always IN2000 SCSI support' CONFIG_SCSI_IN2000 $CONFIG_SCSI
 dep_tristate 'AM53/79C974 PCI SCSI support' CONFIG_SCSI_AM53C974 $CONFIG_SCSI $CONFIG_PCI
 dep_tristate 'AMI MegaRAID support (old driver)' CONFIG_SCSI_MEGARAID $CONFIG_SCSI
-dep_tristate 'AMI MegaRAID support (new driver)' CONFIG_SCSI_MEGARAID2 $CONFIG_SCSI
+if [ "$CONFIG_SCSI_MEGARAID" != "y" ]; then
+ dep_tristate 'AMI MegaRAID support (new driver)' CONFIG_SCSI_MEGARAID2 $CONFIG_SCSI
+fi
 
 dep_tristate 'BusLogic SCSI support' CONFIG_SCSI_BUSLOGIC $CONFIG_SCSI
 if [ "$CONFIG_SCSI_BUSLOGIC" != "n" ]; then

cu
Adrian 

-- 

       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

This archive was generated by hypermail 2b29 : Thu May 15 2003 - 22:00:36 EST