aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/3c59x.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/3c59x.c')
-rw-r--r--drivers/net/3c59x.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/3c59x.c b/drivers/net/3c59x.c
index 7f47124f118d..26212a965cad 100644
--- a/drivers/net/3c59x.c
+++ b/drivers/net/3c59x.c
@@ -841,7 +841,7 @@ enum xcvr_types {
841 XCVR_100baseFx, XCVR_MII=6, XCVR_NWAY=8, XCVR_ExtMII=9, XCVR_Default=10, 841 XCVR_100baseFx, XCVR_MII=6, XCVR_NWAY=8, XCVR_ExtMII=9, XCVR_Default=10,
842}; 842};
843 843
844static struct media_table { 844static const struct media_table {
845 char *name; 845 char *name;
846 unsigned int media_bits:16, /* Bits to set in Wn4_Media register. */ 846 unsigned int media_bits:16, /* Bits to set in Wn4_Media register. */
847 mask:8, /* The transceiver-present bit in Wn3_Config.*/ 847 mask:8, /* The transceiver-present bit in Wn3_Config.*/
@@ -1445,7 +1445,7 @@ static int __devinit vortex_probe1(struct device *gendev,
1445 } 1445 }
1446 1446
1447 { 1447 {
1448 static const char * ram_split[] = {"5:3", "3:1", "1:1", "3:5"}; 1448 static const char * const ram_split[] = {"5:3", "3:1", "1:1", "3:5"};
1449 unsigned int config; 1449 unsigned int config;
1450 EL3WINDOW(3); 1450 EL3WINDOW(3);
1451 vp->available_media = ioread16(ioaddr + Wn3_Options); 1451 vp->available_media = ioread16(ioaddr + Wn3_Options);