lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'net-const'

Browse Source
This commit is contained in:
Jeff Garzik
2006-03-03 22:22:45 -05:00
parent f90fdc3cce f71e130966
commit 46153552b4
97 changed files with 972 additions and 830 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/ns83820.c
View File

@@ -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;