diff options
| author | David S. Miller <davem@davemloft.net> | 2008-02-06 12:52:44 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-02-06 12:52:44 +0100 |
| commit | 655d2ce073f5927194dbc28d2bd3c062a4a3caac (patch) | |
| tree | 9fa289764e2b3cd8dbdc6d11299f0f16b93414b6 /drivers/net/iseries_veth.c | |
| parent | ipvs: Make wrr "no available servers" error message rate-limited (diff) | |
| parent | virtio net: fix oops on interface-up (diff) | |
| download | linux-655d2ce073f5927194dbc28d2bd3c062a4a3caac.tar.xz linux-655d2ce073f5927194dbc28d2bd3c062a4a3caac.zip | |
Merge branch 'upstream-davem' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/net/iseries_veth.c')
| -rw-r--r-- | drivers/net/iseries_veth.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/iseries_veth.c b/drivers/net/iseries_veth.c index 419861cbc65e..58d3bb622da6 100644 --- a/drivers/net/iseries_veth.c +++ b/drivers/net/iseries_veth.c @@ -1020,7 +1020,7 @@ static const struct ethtool_ops ops = { .get_link = veth_get_link, }; -static struct net_device * __init veth_probe_one(int vlan, +static struct net_device *veth_probe_one(int vlan, struct vio_dev *vio_dev) { struct net_device *dev; |