diff -uNr linux-2.4.21/drivers/scsi/scsi_scan.c linux-2.4.21.scan/drivers/scsi/scsi_scan.c
--- linux-2.4.21/drivers/scsi/scsi_scan.c	2004-01-15 00:16:51.000000000 +0100
+++ linux-2.4.21.scan/drivers/scsi/scsi_scan.c	2004-01-15 00:24:13.000000000 +0100
@@ -27,7 +27,7 @@
  * Flags for irregular SCSI devices that need special treatment 
  */
 #define BLIST_NOLUN     	0x001	/* Don't scan for LUNs */
-#define BLIST_FORCELUN  	0x002	/* Known to have LUNs, force sanning */
+#define BLIST_FORCELUN  	0x002	/* Known to have LUNs, force scanning, deprecated */
 #define BLIST_BORKEN    	0x004	/* Flag for broken handshaking */
 #define BLIST_KEY       	0x008	/* Needs to be unlocked by special command */
 #define BLIST_SINGLELUN 	0x010	/* LUNs should better not be used in parallel */
@@ -110,9 +110,6 @@
 	{"HP", "C1750A", "3226", BLIST_NOLUN},			/* scanjet iic */
 	{"HP", "C1790A", "", BLIST_NOLUN},			/* scanjet iip */
 	{"HP", "C2500A", "", BLIST_NOLUN},			/* scanjet iicx */
-	{"HP", "A6188A", "*", BLIST_SPARSELUN},			/* HP Va7100 Array */
-	{"HP", "A6189A", "*", BLIST_SPARSELUN},			/* HP Va7400 Array */
-	{"HP", "A6189B", "*", BLIST_SPARSELUN},			/* HP Va7410 Array */
 	{"YAMAHA", "CDR100", "1.00", BLIST_NOLUN},		/* Locks up if polled for lun != 0 */
 	{"YAMAHA", "CDR102", "1.00", BLIST_NOLUN},		/* Locks up if polled for lun != 0  
 								 * extra reset */
@@ -130,6 +127,7 @@
 	{"SONY", "CD-ROM CDU-8001", "*", BLIST_BORKEN},
 	{"TEXEL", "CD-ROM", "1.06", BLIST_BORKEN},
 	{"IOMEGA", "Io20S         *F", "*", BLIST_KEY},
+	{"iomega", "jaz 1GB", "J.86", BLIST_NOTQ | BLIST_NOLUN},
 	{"INSITE", "Floptical   F*8I", "*", BLIST_KEY},
 	{"INSITE", "I325VM", "*", BLIST_KEY},
 	{"LASOUND","CDX7405","3.10", BLIST_MAX5LUN | BLIST_SINGLELUN},
@@ -145,12 +143,18 @@
 	{"EMULEX", "MD21/S2     ESDI", "*", BLIST_SINGLELUN},
 	{"CANON", "IPUBJD", "*", BLIST_SPARSELUN},
 	{"nCipher", "Fastness Crypto", "*", BLIST_FORCELUN},
-	{"DEC","HSG80","*", BLIST_FORCELUN},
+	/* Note about the following BLIST_FORCELUN entries: Most should probably be
+	 * BLIST_SPARSELUN or BLIST_SPARSELUN | BLIST_LARGELUN. 
+	 * 2003-03-21, garloff@suse.de */
+	{"DEC","HSG80","*", BLIST_FORCELUN | BLIST_LARGELUN},
+	{"COMPAQ", "MSA1000", "*", BLIST_SPARSELUN | BLIST_LARGELUN},
+	{"COMPAQ","HSV110","*", BLIST_SPARSELUN | BLIST_LARGELUN},
+	{"HP","HSV100","*", BLIST_SPARSELUN | BLIST_LARGELUN},
+	//{"COMPAQ", "MSA1000", "*", BLIST_FORCELUN},
 	{"COMPAQ","LOGICAL VOLUME","*", BLIST_FORCELUN},
 	{"COMPAQ","CR3500","*", BLIST_FORCELUN},
 	{"NEC", "PD-1 ODX654P", "*", BLIST_FORCELUN | BLIST_SINGLELUN},
 	{"MATSHITA", "PD-1", "*", BLIST_FORCELUN | BLIST_SINGLELUN},
-	{"iomega", "jaz 1GB", "J.86", BLIST_NOTQ | BLIST_NOLUN},
  	{"TOSHIBA","CDROM","*", BLIST_ISROM},
  	{"TOSHIBA","CD-ROM","*", BLIST_ISROM},
 	{"MegaRAID", "LD", "*", BLIST_FORCELUN},
@@ -160,30 +164,37 @@
 	{"DELL", "PV660F   PSEUDO",   "*", BLIST_SPARSELUN | BLIST_LARGELUN},
 	{"DELL", "PSEUDO DEVICE .",   "*", BLIST_SPARSELUN | BLIST_LARGELUN}, // Dell PV 530F
 	{"DELL", "PV530F",    "*", BLIST_SPARSELUN | BLIST_LARGELUN}, // Dell PV 530F
-	{"EMC", "SYMMETRIX", "*", BLIST_SPARSELUN | BLIST_LARGELUN | BLIST_FORCELUN},
-	{"HP", "A6189A", "*", BLIST_SPARSELUN |  BLIST_LARGELUN}, // HP VA7400, by Alar Aun
+	{"DELL", "PV-136T-FC", "*", BLIST_FORCELUN},
+	{"DELL", "PERCRAID", "*", BLIST_FORCELUN},
+	{"EMC", "SYMMETRIX", "*", BLIST_SPARSELUN | BLIST_LARGELUN /*| BLIST_FORCELUN */},
+	{"EUROLOGC", "FC2502", "*", BLIST_LARGELUN | BLIST_SPARSELUN},
+	{"HP", "A6188A", "*", BLIST_SPARSELUN | BLIST_LARGELUN},/* HP Va7100 Array */
+	{"HP", "A6189A", "*", BLIST_SPARSELUN | BLIST_LARGELUN},/* HP Va7400 Array */
+	{"HP", "A6218A", "*", BLIST_SPARSELUN | BLIST_LARGELUN},/* HP Va7410 Array */
 	{"HP", "OPEN-", "*", BLIST_SPARSELUN | BLIST_LARGELUN},	/* HP XP Arrays */
+	{"HP", "NetRAID-4M", "*", BLIST_FORCELUN | BLIST_LARGELUN},	// HP NetRaid
+	{"HP", "C1557A", "*", BLIST_FORCELUN},
 	{"CMD", "CRA-7280", "*", BLIST_SPARSELUN | BLIST_LARGELUN},   // CMD RAID Controller
 	{"CNSI", "G7324", "*", BLIST_SPARSELUN | BLIST_LARGELUN},     // Chaparral G7324 RAID
 	{"CNSi", "G8324", "*", BLIST_SPARSELUN | BLIST_LARGELUN},     // Chaparral G8324 RAID
 	{"Zzyzx", "RocketStor 500S", "*", BLIST_SPARSELUN},
 	{"Zzyzx", "RocketStor 2000", "*", BLIST_SPARSELUN},
 	{"SONY", "TSL",       "*", BLIST_FORCELUN},  // DDS3 & DDS4 autoloaders
-	{"DELL", "PERCRAID", "*", BLIST_FORCELUN},
-	{"HP", "NetRAID-4M", "*", BLIST_FORCELUN},
 	{"ADAPTEC", "AACRAID", "*", BLIST_FORCELUN},
 	{"ADAPTEC", "Adaptec 5400S", "*", BLIST_FORCELUN},
-	{"COMPAQ", "MSA1000", "*", BLIST_SPARSELUN | BLIST_LARGELUN},
-	{"HP", "C1557A", "*", BLIST_FORCELUN},
 	{"IBM", "AuSaV1S2", "*", BLIST_FORCELUN},
+	{"IBM", "ProFibre 4000R", "*", BLIST_SPARSELUN | BLIST_LARGELUN},
+	{"IBM", "3542", "*", BLIST_FORCELUN},
 	{"FSC", "CentricStor", "*", BLIST_SPARSELUN | BLIST_LARGELUN},
 	{"DDN", "SAN DataDirector", "*", BLIST_SPARSELUN},
 	{"HITACHI", "DF400", "*", BLIST_SPARSELUN},
 	{"HITACHI", "DF500", "*", BLIST_SPARSELUN},
 	{"HITACHI", "DF600", "*", BLIST_SPARSELUN},
-	{"IBM", "ProFibre 4000R", "*", BLIST_SPARSELUN | BLIST_LARGELUN},
-	{"HITACHI", "OPEN-", "*", BLIST_SPARSELUN},		/* HITACHI XP Arrays */
-	{"WINSYS","FLASHDISK G6", "*", BLIST_SPARSELUN},
+	{"HITACHI", "OPEN-", "*", BLIST_SPARSELUN | BLIST_LARGELUN},	/* HITACHI XP Arrays */
+	{"WINSYS","FLASHDISK G6", "*", BLIST_SPARSELUN},	// was: BLIST_FORCELUN
+	{"ADIC", "Pathlight 5000", "*", BLIST_SPARSELUN | BLIST_LARGELUN},
+	{"PATHLGHT", "SAN Router", "*", BLIST_SPARSELUN | BLIST_LARGELUN},
+	{"Crossrds", "4", "*", BLIST_SPARSELUN | BLIST_LARGELUN}, // 4150, 4250, 4450
 	{"DotHill","SANnet RAID X300", "*", BLIST_SPARSELUN},	
 	{"SUN", "T300", "*", BLIST_SPARSELUN},
 	{"SUN", "T4", "*", BLIST_SPARSELUN},
@@ -194,7 +205,7 @@
 	{"SGI", "TP9400", "*", BLIST_SPARSELUN | BLIST_LARGELUN},
 	{"SGI", "TP9500", "*", BLIST_SPARSELUN | BLIST_LARGELUN},
 	{"MYLEX", "DACARMRB", "*", BLIST_SPARSELUN | BLIST_LARGELUN},
-
+	{"NEC", "iStorage", "*", BLIST_SPARSELUN | BLIST_LARGELUN | BLIST_FORCELUN},
 	/*
 	 * Must be at end of list...
 	 */