patch-1.3.15 linux/drivers/block/sbpcd.c

Next file: linux/drivers/char/atixlmouse.c
Previous file: linux/drivers/block/ide.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v1.3.14/linux/drivers/block/sbpcd.c linux/drivers/block/sbpcd.c
@@ -494,24 +494,24 @@
 static unsigned char msgnum=0;
 static char msgbuf[80];
 
-static char *str_sb = "SoundBlaster";
-static char *str_sb_l = "soundblaster";
-static char *str_lm = "LaserMate";
-static char *str_sp = "SPEA";
-static char *str_sp_l = "spea";
-char *type;
+static const char *str_sb = "SoundBlaster";
+static const char *str_sb_l = "soundblaster";
+static const char *str_lm = "LaserMate";
+static const char *str_sp = "SPEA";
+static const char *str_sp_l = "spea";
+const char *type;
 
 #if !(SBPCD_ISSUE-1)
-static char *major_name="sbpcd";
+static const char *major_name="sbpcd";
 #endif
 #if !(SBPCD_ISSUE-2)
-static char *major_name="sbpcd2";
+static const char *major_name="sbpcd2";
 #endif
 #if !(SBPCD_ISSUE-3)
-static char *major_name="sbpcd3";
+static const char *major_name="sbpcd3";
 #endif
 #if !(SBPCD_ISSUE-4)
-static char *major_name="sbpcd4";
+static const char *major_name="sbpcd4";
 #endif
 
 /*==========================================================================*/
@@ -691,7 +691,7 @@
 /*
  * DDI interface
  */
-static void msg(int level, char *fmt, ...)
+static void msg(int level, const char *fmt, ...)
 {
 	char buf[256];
 	va_list args;
@@ -4983,7 +4983,7 @@
 #if (SBPCD_ISSUE-1)
 static
 #endif
-void sbpcd_setup(char *s, int *p)
+void sbpcd_setup(const char *s, int *p)
 {
 	setup_done++;
 	msg(DBG_INI,"sbpcd_setup called with %04X,%s\n",p[1], s);

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov with Sam's (original) version
of this