tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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>

authored by

Stephen Hemminger and committed by
David S. Miller 03f54b3d f11c179e

+7 -6
+1 -1
drivers/net/tulip/de4x5.c
··· 479 479 480 480 #include "de4x5.h" 481 481 482 - static const char version[] __devinitdata = 482 + static const char version[] __devinitconst = 483 483 KERN_INFO "de4x5.c:V0.546 2001/02/22 davies@maniac.ultranet.com\n"; 484 484 485 485 #define c_char const char
+1 -1
drivers/net/tulip/dmfe.c
··· 288 288 289 289 /* Global variable declaration ----------------------------- */ 290 290 static int __devinitdata printed_version; 291 - static char version[] __devinitdata = 291 + static const char version[] __devinitconst = 292 292 KERN_INFO DRV_NAME ": Davicom DM9xxx net driver, version " 293 293 DRV_VERSION " (" DRV_RELDATE ")\n"; 294 294
+1 -1
drivers/net/tulip/uli526x.c
··· 200 200 201 201 /* Global variable declaration ----------------------------- */ 202 202 static int __devinitdata printed_version; 203 - static char version[] __devinitdata = 203 + static const char version[] __devinitconst = 204 204 KERN_INFO DRV_NAME ": ULi M5261/M5263 net driver, version " 205 205 DRV_VERSION " (" DRV_RELDATE ")\n"; 206 206
+4 -3
drivers/net/tulip/winbond-840.c
··· 139 139 #define PKT_BUF_SZ 1536 /* Size of each temporary Rx buffer.*/ 140 140 141 141 /* These identify the driver base version and may not be removed. */ 142 - static const char version[] __initdata = 143 - KERN_INFO DRV_NAME ".c:v" DRV_VERSION " (2.4 port) " DRV_RELDATE " Donald Becker <becker@scyld.com>\n" 144 - KERN_INFO " http://www.scyld.com/network/drivers.html\n"; 142 + static const char version[] __initconst = 143 + KERN_INFO DRV_NAME ".c:v" DRV_VERSION " (2.4 port) " 144 + DRV_RELDATE " Donald Becker <becker@scyld.com>\n" 145 + KERN_INFO " http://www.scyld.com/network/drivers.html\n"; 145 146 146 147 MODULE_AUTHOR("Donald Becker <becker@scyld.com>"); 147 148 MODULE_DESCRIPTION("Winbond W89c840 Ethernet driver");