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/3c59x.c | |
parent | f90fdc3cce3d8c8ed09615dc68cb789655078803 (diff) | |
parent | f71e130966ba429dbd24be08ddbcdf263df9a5ad (diff) |
Merge branch 'net-const'
Diffstat (limited to 'drivers/net/3c59x.c')
-rw-r--r-- | drivers/net/3c59x.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/3c59x.c b/drivers/net/3c59x.c index 9e8897976a69..5d11a06ecb2c 100644 --- a/drivers/net/3c59x.c +++ b/drivers/net/3c59x.c | |||
@@ -842,7 +842,7 @@ enum xcvr_types { | |||
842 | XCVR_100baseFx, XCVR_MII=6, XCVR_NWAY=8, XCVR_ExtMII=9, XCVR_Default=10, | 842 | XCVR_100baseFx, XCVR_MII=6, XCVR_NWAY=8, XCVR_ExtMII=9, XCVR_Default=10, |
843 | }; | 843 | }; |
844 | 844 | ||
845 | static struct media_table { | 845 | static const struct media_table { |
846 | char *name; | 846 | char *name; |
847 | unsigned int media_bits:16, /* Bits to set in Wn4_Media register. */ | 847 | unsigned int media_bits:16, /* Bits to set in Wn4_Media register. */ |
848 | mask:8, /* The transceiver-present bit in Wn3_Config.*/ | 848 | mask:8, /* The transceiver-present bit in Wn3_Config.*/ |
@@ -1446,7 +1446,7 @@ static int __devinit vortex_probe1(struct device *gendev, | |||
1446 | } | 1446 | } |
1447 | 1447 | ||
1448 | { | 1448 | { |
1449 | static const char * ram_split[] = {"5:3", "3:1", "1:1", "3:5"}; | 1449 | static const char * const ram_split[] = {"5:3", "3:1", "1:1", "3:5"}; |
1450 | unsigned int config; | 1450 | unsigned int config; |
1451 | EL3WINDOW(3); | 1451 | EL3WINDOW(3); |
1452 | vp->available_media = ioread16(ioaddr + Wn3_Options); | 1452 | vp->available_media = ioread16(ioaddr + Wn3_Options); |