Thread (17 messages) 17 messages, 2 authors, 2009-02-27
STALE6302d

[PATCH 01/15] tulip: get rid of warning for non-const string literal

From: Stephen Hemminger <hidden>
Date: 2009-02-26 20:20:20

Signed-off-by: Stephen Hemminger <redacted>
--- a/drivers/net/tulip/dmfe.c	2009-02-26 09:35:40.000000000 -0800
+++ b/drivers/net/tulip/dmfe.c	2009-02-26 09:36:21.000000000 -0800
@@ -288,7 +288,7 @@ enum dmfe_CR6_bits {
 
 /* Global variable declaration ----------------------------- */
 static int __devinitdata printed_version;
-static char version[] __devinitdata =
+static const char version[] __devinitconst =
 	KERN_INFO DRV_NAME ": Davicom DM9xxx net driver, version "
 	DRV_VERSION " (" DRV_RELDATE ")\n";
 
--- a/drivers/net/tulip/winbond-840.c	2009-02-26 09:37:40.000000000 -0800
+++ b/drivers/net/tulip/winbond-840.c	2009-02-26 09:39:38.000000000 -0800
@@ -139,9 +139,10 @@ static int full_duplex[MAX_UNITS] = {-1,
 #define PKT_BUF_SZ		1536	/* Size of each temporary Rx buffer.*/
 
 /* These identify the driver base version and may not be removed. */
-static const char version[] __initdata =
-KERN_INFO DRV_NAME ".c:v" DRV_VERSION " (2.4 port) " DRV_RELDATE "  Donald Becker <becker@scyld.com>\n"
-KERN_INFO "  http://www.scyld.com/network/drivers.html\n";
+static const char version[] __initconst =
+	KERN_INFO DRV_NAME ".c:v" DRV_VERSION " (2.4 port) "
+	DRV_RELDATE "  Donald Becker <becker@scyld.com>\n"
+	KERN_INFO "  http://www.scyld.com/network/drivers.html\n";
 
 MODULE_AUTHOR("Donald Becker <becker@scyld.com>");
 MODULE_DESCRIPTION("Winbond W89c840 Ethernet driver");
--- a/drivers/net/tulip/de4x5.c	2009-02-26 09:40:54.000000000 -0800
+++ b/drivers/net/tulip/de4x5.c	2009-02-26 09:41:38.000000000 -0800
@@ -479,7 +479,7 @@
 
 #include "de4x5.h"
 
-static const char version[] __devinitdata =
+static const char version[] __devinitconst =
 	KERN_INFO "de4x5.c:V0.546 2001/02/22 davies@maniac.ultranet.com\n";
 
 #define c_char const char
--- a/drivers/net/tulip/uli526x.c	2009-02-26 09:41:52.000000000 -0800
+++ b/drivers/net/tulip/uli526x.c	2009-02-26 09:42:14.000000000 -0800
@@ -200,7 +200,7 @@ enum uli526x_CR6_bits {
 
 /* Global variable declaration ----------------------------- */
 static int __devinitdata printed_version;
-static char version[] __devinitdata =
+static const char version[] __devinitconst =
 	KERN_INFO DRV_NAME ": ULi M5261/M5263 net driver, version "
 	DRV_VERSION " (" DRV_RELDATE ")\n";
 
-- 
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help