diff options
| author | Jeff Garzik | 2006-03-04 04:22:45 +0100 |
|---|---|---|
| committer | Jeff Garzik | 2006-03-04 04:22:45 +0100 |
| commit | 46153552b43675dd4057cd526331b5bd10f39c7d (patch) | |
| tree | 62b6055ee61e320dc10ea81903abbe2e7553bf4e /drivers/net/ns83820.c | |
| parent | [PATCH] sb1250-mac: Add support for the BCM1480 (diff) | |
| parent | Massive net driver const-ification. (diff) | |
| download | kernel-qcow2-linux-46153552b43675dd4057cd526331b5bd10f39c7d.tar.gz kernel-qcow2-linux-46153552b43675dd4057cd526331b5bd10f39c7d.tar.xz kernel-qcow2-linux-46153552b43675dd4057cd526331b5bd10f39c7d.zip | |
Merge branch 'net-const'
Diffstat (limited to 'drivers/net/ns83820.c')
| -rw-r--r-- | drivers/net/ns83820.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ns83820.c b/drivers/net/ns83820.c index 253cf018dfba..0fede50abd3e 100644 --- a/drivers/net/ns83820.c +++ b/drivers/net/ns83820.c @@ -652,7 +652,7 @@ static void FASTCALL(phy_intr(struct net_device *ndev)); static void fastcall phy_intr(struct net_device *ndev) { struct ns83820 *dev = PRIV(ndev); - static char *speeds[] = { "10", "100", "1000", "1000(?)", "1000F" }; + static const char *speeds[] = { "10", "100", "1000", "1000(?)", "1000F" }; u32 cfg, new_cfg; u32 tbisr, tanar, tanlpar; int speed, fullduplex, newlinkstate; |