[PATCH] Disambiguate esp.c clones

From: Joshua Kwan <joshk@triplehelix.org>

Debian's initial ramdisk creation scripts rely on the content of /proc/scsi
to determine which module is needed for the ramdisk.  Unfortunately, bad
things happen when a bazillion different drivers use the _exact same name_
for /proc, namely the esp family.

Give them all unique names.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

drivers/scsi/dec_esp.c

@@ -120,7 +120,7 @@ static int dec_esp_release(struct Scsi_Host *shost)
 }
 
 static Scsi_Host_Template driver_template = {
-	.proc_name		= "esp",
+	.proc_name		= "dec_esp",
 	.proc_info		= &esp_proc_info,
 	.name			= "NCR53C94",
 	.detect			= dec_esp_detect,

drivers/scsi/jazz_esp.c

@@ -286,7 +286,7 @@ static void dma_led_on(struct NCR_ESP *esp)
 }
 
 static Scsi_Host_Template driver_template = {
-	.proc_name		= "esp",
+	.proc_name		= "jazz_esp",
 	.proc_info		= &esp_proc_info,
 	.name			= "ESP 100/100a/200",
 	.detect			= jazz_esp_detect,

drivers/scsi/mac_esp.c

@@ -731,7 +731,7 @@ static void dma_setup_quick(struct NCR_ESP * esp, __u32 addr, int count, int wri
 }
 
 static Scsi_Host_Template driver_template = {
-	.proc_name		= "esp",
+	.proc_name		= "mac_esp",
 	.name			= "Mac 53C9x SCSI",
 	.detect			= mac_esp_detect,
 	.slave_alloc		= esp_slave_alloc,

drivers/scsi/mca_53c9x.c

@@ -445,7 +445,7 @@ static void dma_led_off(struct NCR_ESP *esp)
 }
 
 static Scsi_Host_Template driver_template = {
-	.proc_name		= "esp",
+	.proc_name		= "mca_53c9x",
 	.name			= "NCR 53c9x SCSI",
 	.detect			= mca_esp_detect,
 	.slave_alloc		= esp_slave_alloc,

drivers/scsi/sun3x_esp.c

@@ -370,7 +370,7 @@ static int sun3x_esp_release(struct Scsi_Host *instance)
 }
 
 static Scsi_Host_Template driver_template = {
-	.proc_name		= "esp",
+	.proc_name		= "sun3x_esp",
 	.proc_info		= &esp_proc_info,
 	.name			= "Sun ESP 100/100a/200",
 	.detect			= sun3x_esp_detect,