diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /drivers/net/3c509.c | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'drivers/net/3c509.c')
| -rw-r--r-- | drivers/net/3c509.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/3c509.c b/drivers/net/3c509.c index 91abb965fb44..44b28b2d7003 100644 --- a/drivers/net/3c509.c +++ b/drivers/net/3c509.c | |||
| @@ -1207,7 +1207,7 @@ el3_netdev_get_ecmd(struct net_device *dev, struct ethtool_cmd *ecmd) | |||
| 1207 | ecmd->duplex = DUPLEX_FULL; | 1207 | ecmd->duplex = DUPLEX_FULL; |
| 1208 | } | 1208 | } |
| 1209 | 1209 | ||
| 1210 | ecmd->speed = SPEED_10; | 1210 | ethtool_cmd_speed_set(ecmd, SPEED_10); |
| 1211 | EL3WINDOW(1); | 1211 | EL3WINDOW(1); |
| 1212 | return 0; | 1212 | return 0; |
| 1213 | } | 1213 | } |