diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
| commit | 1c01a80cfec6f806246f31ff2680cd3639b30e67 (patch) | |
| tree | 0b554aad2ec1da71ecf6339d4ba51617bfe1dc3c /drivers/net/cris | |
| parent | c44d79950b2daa1025e62eede73e4e4a274d1ef3 (diff) | |
| parent | 4a9f65f6304a00f6473e83b19c1e83caa1e42530 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/smsc911x.c
Diffstat (limited to 'drivers/net/cris')
| -rw-r--r-- | drivers/net/cris/eth_v10.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/cris/eth_v10.c b/drivers/net/cris/eth_v10.c index e759d74edd01..e66aceb57cef 100644 --- a/drivers/net/cris/eth_v10.c +++ b/drivers/net/cris/eth_v10.c | |||
| @@ -1383,7 +1383,7 @@ e100_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) | |||
| 1383 | spin_lock(&np->lock); /* Preempt protection */ | 1383 | spin_lock(&np->lock); /* Preempt protection */ |
| 1384 | switch (cmd) { | 1384 | switch (cmd) { |
| 1385 | /* The ioctls below should be considered obsolete but are */ | 1385 | /* The ioctls below should be considered obsolete but are */ |
| 1386 | /* still present for compatability with old scripts/apps */ | 1386 | /* still present for compatibility with old scripts/apps */ |
| 1387 | case SET_ETH_SPEED_10: /* 10 Mbps */ | 1387 | case SET_ETH_SPEED_10: /* 10 Mbps */ |
| 1388 | e100_set_speed(dev, 10); | 1388 | e100_set_speed(dev, 10); |
| 1389 | break; | 1389 | break; |