[PATCH] trivial patch for 2.4: resolve megaraid_info name collision

[Denis Vlasenko]

I'm not sure whether it make sense to compile in
megaraid and megaraid2 at once, but it does not build
without this patch.
--
vda


diff -urpN linux-2.4.27-pre3.org/drivers/scsi/megaraid2.c linux-2.4.27-pre3.fix/drivers/scsi/megaraid2.c
--- linux-2.4.27-pre3.org/drivers/scsi/megaraid2.c	Sat May 22 22:41:59 2004
+++ linux-2.4.27-pre3.fix/drivers/scsi/megaraid2.c	Sat Sep 18 00:15:11 2004
@@ -2647,7 +2647,7 @@ mega_free_sgl(adapter_t *adapter)
  * Get information about the card/driver
  */
 const char *
-megaraid_info(struct Scsi_Host *host)
+megaraid2_info(struct Scsi_Host *host)
 {
 	static char buffer[512];
 	adapter_t *adapter;
diff -urpN linux-2.4.27-pre3.org/drivers/scsi/megaraid2.h linux-2.4.27-pre3.fix/drivers/scsi/megaraid2.h
--- linux-2.4.27-pre3.org/drivers/scsi/megaraid2.h	Sat May 22 22:41:59 2004
+++ linux-2.4.27-pre3.fix/drivers/scsi/megaraid2.h	Sat Sep 18 00:15:21 2004
@@ -126,7 +126,7 @@
 	.proc_name =		 	"megaraid",		\
 	.detect =			megaraid_detect,	\
 	.release =			megaraid_release,	\
-	.info =				megaraid_info,		\
+	.info =				megaraid2_info,		\
 	.command =			megaraid_command,	\
 	.queuecommand =			megaraid_queue,		\
 	.max_sectors =			MAX_SECTORS_PER_IO,	\
@@ -1086,7 +1086,7 @@ typedef enum { LOCK_INT, LOCK_EXT } lock
 #define MBOX_ABORT_SLEEP	60
 #define MBOX_RESET_SLEEP	30
 
-const char *megaraid_info (struct Scsi_Host *);
+const char *megaraid2_info(struct Scsi_Host *);
 
 static int megaraid_detect(Scsi_Host_Template *);
 static void mega_find_card(Scsi_Host_Template *, u16, u16);