aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/misc/sgi-xp/xpnet.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2009-02-04 16:51:58 -0800
committerDavid S. Miller <davem@davemloft.net>2009-02-04 16:51:58 -0800
commit005c79b3d4df48fa01b77e5ccf46e5cd4754cfd5 (patch)
treebc3ef1b64dcdb48b2d6accb51951a0d73b33262e /drivers/misc/sgi-xp/xpnet.c
parentgianfar: Fix stashing support (diff)
parentMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/blackfin-2.6 (diff)
downloadlinux-dev-005c79b3d4df48fa01b77e5ccf46e5cd4754cfd5.tar.xz
linux-dev-005c79b3d4df48fa01b77e5ccf46e5cd4754cfd5.zip
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'drivers/misc/sgi-xp/xpnet.c')
-rw-r--r--drivers/misc/sgi-xp/xpnet.c3
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 @@
* License. See the file "COPYING" in the main directory of this archive
* for more details.
*
- * Copyright (C) 1999-2008 Silicon Graphics, Inc. All rights reserved.
+ * Copyright (C) 1999-2009 Silicon Graphics, Inc. All rights reserved.
*/
/*
@@ -551,6 +551,7 @@ xpnet_init(void)
netif_carrier_off(xpnet_device);
+ xpnet_device->netdev_ops = &xpnet_netdev_ops;
xpnet_device->mtu = XPNET_DEF_MTU;
/*