diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-03-03 22:22:45 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-03-03 22:22:45 -0500 |
| commit | 46153552b43675dd4057cd526331b5bd10f39c7d (patch) | |
| tree | 62b6055ee61e320dc10ea81903abbe2e7553bf4e /drivers/net/eepro100.c | |
| parent | f90fdc3cce3d8c8ed09615dc68cb789655078803 (diff) | |
| parent | f71e130966ba429dbd24be08ddbcdf263df9a5ad (diff) | |
Merge branch 'net-const'
Diffstat (limited to 'drivers/net/eepro100.c')
| -rw-r--r-- | drivers/net/eepro100.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/eepro100.c b/drivers/net/eepro100.c index 8c62ced2c9b2..467fc861360d 100644 --- a/drivers/net/eepro100.c +++ b/drivers/net/eepro100.c | |||
| @@ -27,7 +27,7 @@ | |||
| 27 | rx_align support: enables rx DMA without causing unaligned accesses. | 27 | rx_align support: enables rx DMA without causing unaligned accesses. |
| 28 | */ | 28 | */ |
| 29 | 29 | ||
| 30 | static const char *version = | 30 | static const char * const version = |
| 31 | "eepro100.c:v1.09j-t 9/29/99 Donald Becker http://www.scyld.com/network/eepro100.html\n" | 31 | "eepro100.c:v1.09j-t 9/29/99 Donald Becker http://www.scyld.com/network/eepro100.html\n" |
| 32 | "eepro100.c: $Revision: 1.36 $ 2000/11/17 Modified by Andrey V. Savochkin <saw@saw.sw.com.sg> and others\n"; | 32 | "eepro100.c: $Revision: 1.36 $ 2000/11/17 Modified by Andrey V. Savochkin <saw@saw.sw.com.sg> and others\n"; |
| 33 | 33 | ||
| @@ -469,7 +469,7 @@ static const char i82558_config_cmd[CONFIG_DATA_SIZE] = { | |||
| 469 | 0x31, 0x05, }; | 469 | 0x31, 0x05, }; |
| 470 | 470 | ||
| 471 | /* PHY media interface chips. */ | 471 | /* PHY media interface chips. */ |
| 472 | static const char *phys[] = { | 472 | static const char * const phys[] = { |
| 473 | "None", "i82553-A/B", "i82553-C", "i82503", | 473 | "None", "i82553-A/B", "i82553-C", "i82503", |
| 474 | "DP83840", "80c240", "80c24", "i82555", | 474 | "DP83840", "80c240", "80c24", "i82555", |
| 475 | "unknown-8", "unknown-9", "DP83840A", "unknown-11", | 475 | "unknown-8", "unknown-9", "DP83840A", "unknown-11", |