Merge branch 'upstream-fixes' into upstream

This commit is contained in:
Jeff Garzik
2006-08-19 17:45:11 -04:00
74 changed files with 8617 additions and 1584 deletions

View File

@ -109,7 +109,7 @@ static char *media[MAX_UNITS];
#endif
/* These identify the driver base version and may not be removed. */
static char version[] __devinitdata =
static char version[] =
KERN_INFO DRV_NAME ".c:v" DRV_VERSION " " DRV_RELDATE " Written by Donald Becker\n"
KERN_INFO " http://www.scyld.com/network/sundance.html\n";