diff options
author | Stephen Hemminger <shemminger@vyatta.com> | 2009-02-26 05:19:22 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-02-27 01:21:53 -0500 |
commit | 03f54b3dec072d92393c1fb7eaab62e615161833 (patch) | |
tree | 16590917847f66eb6edd14ba1a42c3aa9e73f328 /drivers/net | |
parent | f11c179eea77b8afc2fb7cb4b9a8815b85e3c16f (diff) |
tulip: get rid of warning for non-const string literal
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/tulip/de4x5.c | 2 | ||||
-rw-r--r-- | drivers/net/tulip/dmfe.c | 2 | ||||
-rw-r--r-- | drivers/net/tulip/uli526x.c | 2 | ||||
-rw-r--r-- | drivers/net/tulip/winbond-840.c | 7 |
4 files changed, 7 insertions, 6 deletions
diff --git a/drivers/net/tulip/de4x5.c b/drivers/net/tulip/de4x5.c index 6430a2ec6db1..f9491bd787d1 100644 --- a/drivers/net/tulip/de4x5.c +++ b/drivers/net/tulip/de4x5.c | |||
@@ -479,7 +479,7 @@ | |||
479 | 479 | ||
480 | #include "de4x5.h" | 480 | #include "de4x5.h" |
481 | 481 | ||
482 | static const char version[] __devinitdata = | 482 | static const char version[] __devinitconst = |
483 | KERN_INFO "de4x5.c:V0.546 2001/02/22 davies@maniac.ultranet.com\n"; | 483 | KERN_INFO "de4x5.c:V0.546 2001/02/22 davies@maniac.ultranet.com\n"; |
484 | 484 | ||
485 | #define c_char const char | 485 | #define c_char const char |
diff --git a/drivers/net/tulip/dmfe.c b/drivers/net/tulip/dmfe.c index 2e5c99941f35..e2c9d0f5a755 100644 --- a/drivers/net/tulip/dmfe.c +++ b/drivers/net/tulip/dmfe.c | |||
@@ -288,7 +288,7 @@ enum dmfe_CR6_bits { | |||
288 | 288 | ||
289 | /* Global variable declaration ----------------------------- */ | 289 | /* Global variable declaration ----------------------------- */ |
290 | static int __devinitdata printed_version; | 290 | static int __devinitdata printed_version; |
291 | static char version[] __devinitdata = | 291 | static const char version[] __devinitconst = |
292 | KERN_INFO DRV_NAME ": Davicom DM9xxx net driver, version " | 292 | KERN_INFO DRV_NAME ": Davicom DM9xxx net driver, version " |
293 | DRV_VERSION " (" DRV_RELDATE ")\n"; | 293 | DRV_VERSION " (" DRV_RELDATE ")\n"; |
294 | 294 | ||
diff --git a/drivers/net/tulip/uli526x.c b/drivers/net/tulip/uli526x.c index 030e02e63023..c227db079621 100644 --- a/drivers/net/tulip/uli526x.c +++ b/drivers/net/tulip/uli526x.c | |||
@@ -200,7 +200,7 @@ enum uli526x_CR6_bits { | |||
200 | 200 | ||
201 | /* Global variable declaration ----------------------------- */ | 201 | /* Global variable declaration ----------------------------- */ |
202 | static int __devinitdata printed_version; | 202 | static int __devinitdata printed_version; |
203 | static char version[] __devinitdata = | 203 | static const char version[] __devinitconst = |
204 | KERN_INFO DRV_NAME ": ULi M5261/M5263 net driver, version " | 204 | KERN_INFO DRV_NAME ": ULi M5261/M5263 net driver, version " |
205 | DRV_VERSION " (" DRV_RELDATE ")\n"; | 205 | DRV_VERSION " (" DRV_RELDATE ")\n"; |
206 | 206 | ||
diff --git a/drivers/net/tulip/winbond-840.c b/drivers/net/tulip/winbond-840.c index 426b7c73e36a..c61a01b029af 100644 --- a/drivers/net/tulip/winbond-840.c +++ b/drivers/net/tulip/winbond-840.c | |||
@@ -139,9 +139,10 @@ static int full_duplex[MAX_UNITS] = {-1, -1, -1, -1, -1, -1, -1, -1}; | |||
139 | #define PKT_BUF_SZ 1536 /* Size of each temporary Rx buffer.*/ | 139 | #define PKT_BUF_SZ 1536 /* Size of each temporary Rx buffer.*/ |
140 | 140 | ||
141 | /* These identify the driver base version and may not be removed. */ | 141 | /* These identify the driver base version and may not be removed. */ |
142 | static const char version[] __initdata = | 142 | static const char version[] __initconst = |
143 | KERN_INFO DRV_NAME ".c:v" DRV_VERSION " (2.4 port) " DRV_RELDATE " Donald Becker <becker@scyld.com>\n" | 143 | KERN_INFO DRV_NAME ".c:v" DRV_VERSION " (2.4 port) " |
144 | KERN_INFO " http://www.scyld.com/network/drivers.html\n"; | 144 | DRV_RELDATE " Donald Becker <becker@scyld.com>\n" |
145 | KERN_INFO " http://www.scyld.com/network/drivers.html\n"; | ||
145 | 146 | ||
146 | MODULE_AUTHOR("Donald Becker <becker@scyld.com>"); | 147 | MODULE_AUTHOR("Donald Becker <becker@scyld.com>"); |
147 | MODULE_DESCRIPTION("Winbond W89c840 Ethernet driver"); | 148 | MODULE_DESCRIPTION("Winbond W89c840 Ethernet driver"); |