diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2008-10-13 12:13:56 -0400 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2008-10-13 12:13:56 -0400 |
| commit | e758936e02700ff88a0b08b722a3847b95283ef2 (patch) | |
| tree | 50c919bef1b459a778b85159d5929de95b6c4a01 /drivers/net/gianfar.c | |
| parent | 239cfbde1f5843c4a24199f117d5f67f637d72d5 (diff) | |
| parent | 4480f15b3306f43bbb0310d461142b4e897ca45b (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
include/asm-x86/statfs.h
Diffstat (limited to 'drivers/net/gianfar.c')
| -rw-r--r-- | drivers/net/gianfar.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c index 4320a983a588..b5bb7ae2817f 100644 --- a/drivers/net/gianfar.c +++ b/drivers/net/gianfar.c | |||
| @@ -339,6 +339,9 @@ static int gfar_probe(struct platform_device *pdev) | |||
| 339 | /* Enable most messages by default */ | 339 | /* Enable most messages by default */ |
| 340 | priv->msg_enable = (NETIF_MSG_IFUP << 1 ) - 1; | 340 | priv->msg_enable = (NETIF_MSG_IFUP << 1 ) - 1; |
| 341 | 341 | ||
| 342 | /* Carrier starts down, phylib will bring it up */ | ||
| 343 | netif_carrier_off(dev); | ||
| 344 | |||
| 342 | err = register_netdev(dev); | 345 | err = register_netdev(dev); |
| 343 | 346 | ||
| 344 | if (err) { | 347 | if (err) { |