diff options
| author | H. Peter Anvin <hpa@linux.intel.com> | 2009-02-23 17:05:56 -0500 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2009-02-23 17:05:56 -0500 |
| commit | dc731ca60954310be0993e8992d450c7089fd13d (patch) | |
| tree | 6a997916f963d9e6dfa76fc5564296f57c3f909e /drivers/misc/sgi-xp/xpnet.c | |
| parent | ec5b3d32437571b8a742069a4cfd04edb6b6eda5 (diff) | |
| parent | 20f4d6c3a2a23c5d7d9cc7f42fbb943ca7a03d1f (diff) | |
Merge branch 'x86/urgent' into x86/mce2
Diffstat (limited to 'drivers/misc/sgi-xp/xpnet.c')
| -rw-r--r-- | drivers/misc/sgi-xp/xpnet.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/misc/sgi-xp/xpnet.c b/drivers/misc/sgi-xp/xpnet.c index 7957f525b2f4..6faefcffcb53 100644 --- a/drivers/misc/sgi-xp/xpnet.c +++ b/drivers/misc/sgi-xp/xpnet.c | |||
| @@ -3,7 +3,7 @@ | |||
| 3 | * License. See the file "COPYING" in the main directory of this archive | 3 | * License. See the file "COPYING" in the main directory of this archive |
| 4 | * for more details. | 4 | * for more details. |
| 5 | * | 5 | * |
| 6 | * Copyright (C) 1999-2008 Silicon Graphics, Inc. All rights reserved. | 6 | * Copyright (C) 1999-2009 Silicon Graphics, Inc. All rights reserved. |
| 7 | */ | 7 | */ |
| 8 | 8 | ||
| 9 | /* | 9 | /* |
| @@ -551,6 +551,7 @@ xpnet_init(void) | |||
| 551 | 551 | ||
| 552 | netif_carrier_off(xpnet_device); | 552 | netif_carrier_off(xpnet_device); |
| 553 | 553 | ||
| 554 | xpnet_device->netdev_ops = &xpnet_netdev_ops; | ||
| 554 | xpnet_device->mtu = XPNET_DEF_MTU; | 555 | xpnet_device->mtu = XPNET_DEF_MTU; |
| 555 | 556 | ||
| 556 | /* | 557 | /* |