FW: cciss updates for 2.4.22-pre3 [1 of 6]

[Miller, Mike]

Oops, misspelled the name on the first go round. Sorry.

-----Original Message-----
From: Miller, Mike (OS Dev) 
Sent: Thursday, July 10, 2003 4:43 PM
To: '[e-mail]'; '[e-mail]'
Cc: '[e-mail]'; '[e-mail]'
Subject: cciss updates for 2.4.22-pre3 [1 of 6]

These patches can be installed in any order EXCEPT the final 2 of the 6. They are name p1* & p2* respectively.

This patch was built & tested using kernel 2.4.21 with the 2.4.22pre3 patch
applied. It is intended for inclusion in the 2.4.22 kernel.
Patch name: cciss_2447_6400_name_fix_for_lx2422p3.patch
Changes:
	1. Changes the marketing names (again) for the 6400 Smart Array base
	   controller and the U320 expansion module. Required by marketing.
	2. Corrects the subsystem device ID for the U320 Expansion Module.
	   Bug fix, thanks to Janos Farkas for pointing this out.
--------------------------------------------------------------------------------------------------------------------
diff -burN lx2422p3.test/Documentation/cciss.txt lx2422p3/Documentation/cciss.txt
--- lx2422p3.test/Documentation/cciss.txt	2003-07-07 11:18:18.000000000 -0500
+++ lx2422p3/Documentation/cciss.txt	2003-07-07 13:50:28.000000000 -0500
@@ -11,8 +11,8 @@
 	* SA 5312
 	* SA 641
 	* SA 642
-	* SA 6402
-	* SA 6404/256
+	* SA 6400
+	* SA 6400 U320 Expansion Module
 
 If nodes are not already created in the /dev/cciss directory
 
diff -burN lx2422p3.test/drivers/block/cciss.c lx2422p3/drivers/block/cciss.c
--- lx2422p3.test/drivers/block/cciss.c	2003-07-07 13:47:05.000000000 -0500
+++ lx2422p3/drivers/block/cciss.c	2003-07-07 13:49:34.000000000 -0500
@@ -92,8 +92,8 @@
 	{ 0x40830E11, "Smart Array 5312", &SA5B_access},
 	{ 0x409A0E11, "Smart Array 641", &SA5_access},
 	{ 0x409B0E11, "Smart Array 642", &SA5_access},
-	{ 0x409C0E11, "Smart Array 6402", &SA5_access},
-	{ 0x409C0E11, "Smart Array 6404/256", &SA5_access},
+	{ 0x409C0E11, "Smart Array 6400", &SA5_access},
+	{ 0x409D0E11, "Smart Array 6400 EM", &SA5_access},
 };
 
 /* How long to wait (in millesconds) for board to go into simple mode */