Re: Megaraid does not work with 2.4.22

[Xose Vazquez Perez <xose@wanadoo.es>]

[-- Attachment #1: Type: text/plain, Size: 353 bytes --]

Marcelo Tosatti wrote:

> Fine. I agree on adding in to mainline 2.4.x.

Here go some trivial fixes(add menu entry, list all compatibles
boards in help and put tab instead spaces) for megaraid2.

-thanks-
-- 
If it wasn't for the presence of Lara Croft and Xena Warrior Princess,
techies around the world would have posters of Torvalds on their walls.


[-- Attachment #2: megaraid.patch --]
[-- Type: text/plain, Size: 2979 bytes --]

diff -Nuar old/Documentation/Configure.help new/Documentation/Configure.help
--- old/Documentation/Configure.help	Tue Oct  7 19:11:27 2003
+++ new/Documentation/Configure.help	Tue Oct  7 19:30:00 2003
@@ -9051,9 +9051,11 @@
 
 AMI MegaRAID support (old driver)
 CONFIG_SCSI_MEGARAID
-  This driver supports the AMI MegaRAID 418, 428, 438, 466, 762, 490
-  and 467 SCSI host adapters. This is the old and very heavily tested
-  driver but lacks features like clustering.
+  This driver supports the AMI MegaRAID 418, 428, 438, 466, 762, 490,
+  467, 471 and 493 SCSI host adapters. 
+
+  This is the old and very heavily tested driver but lacks features
+  like clustering.
 
   If you want to compile this driver as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want),
@@ -9062,14 +9064,15 @@
 
 AMI MegaRAID support (new driver)
 CONFIG_SCSI_MEGARAID2
-This driver supports the AMI MegaRAID 418, 428, 438, 466, 762, 490
-and 467 SCSI host adapters. This is the newer less tested but more
-featureful driver.
-
-If you want to compile this driver as a module ( = code which can be
-inserted in and removed from the running kernel whenever you want),
-say M here and read <file:Documentation/modules.txt>.  The module
-will be called megaraid2.o.
+  This driver supports the AMI MegaRAID 418, 428, 438, 466, 762, 490,
+  467, 471, 493 and new Ultra320(518, 520, 531, 532) SCSI host adapters.
+
+  This is the newer less tested but more featureful driver.
+
+  If you want to compile this driver as a module ( = code which can be
+  inserted in and removed from the running kernel whenever you want),
+  say M here and read <file:Documentation/modules.txt>.  The module
+  will be called megaraid2.o.
 
 Intel/ICP (former GDT SCSI Disk Array) RAID Controller support
 CONFIG_SCSI_GDTH
diff -Nuar old/drivers/scsi/Config.in new/drivers/scsi/Config.in
--- old/drivers/scsi/Config.in	Tue Oct  7 19:10:54 2003
+++ new/drivers/scsi/Config.in	Tue Oct  7 19:21:28 2003
@@ -67,6 +67,7 @@
 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' CONFIG_SCSI_MEGARAID $CONFIG_SCSI
+dep_tristate 'AMI MegaRAID2 support' CONFIG_SCSI_MEGARAID2 $CONFIG_SCSI
 
 dep_tristate 'BusLogic SCSI support' CONFIG_SCSI_BUSLOGIC $CONFIG_SCSI
 if [ "$CONFIG_SCSI_BUSLOGIC" != "n" ]; then
diff -Nuar old/drivers/scsi/Makefile new/drivers/scsi/Makefile
--- old/drivers/scsi/Makefile	Tue Oct  7 19:10:49 2003
+++ new/drivers/scsi/Makefile	Tue Oct  7 19:21:41 2003
@@ -110,7 +110,7 @@
 obj-$(CONFIG_SCSI_DC390T)	+= tmscsim.o
 obj-$(CONFIG_SCSI_AM53C974)	+= AM53C974.o
 obj-$(CONFIG_SCSI_MEGARAID)	+= megaraid.o
-obj-$(CONFIG_SCSI_MEGARAID2)   += megaraid2.o
+obj-$(CONFIG_SCSI_MEGARAID2)	+= megaraid2.o
 obj-$(CONFIG_SCSI_ACARD)	+= atp870u.o
 obj-$(CONFIG_SCSI_SUNESP)	+= esp.o
 obj-$(CONFIG_SCSI_GDTH)		+= gdth.o