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

[Adrian Bunk <bunk@fs.tum.de>]

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