diff options
author | Anthony Liguori <aliguori@us.ibm.com> | 2011-09-09 13:13:27 -0500 |
---|---|---|
committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-09-09 13:13:27 -0500 |
commit | 282c355b174755ae53e2feeaf624c418ea009dc6 (patch) | |
tree | a63ec276e67b033ffd9b636eeda262e02b67307f /hw/xen_nic.c | |
parent | da5391edd18a1d75d4ca13f2dffe70e02f851110 (diff) | |
parent | 56c119e52ca229869912b22a5bec283487b0cf9b (diff) |
Merge remote-tracking branch 'sstabellini/xen-next' into staging
Diffstat (limited to 'hw/xen_nic.c')
-rw-r--r-- | hw/xen_nic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/xen_nic.c b/hw/xen_nic.c index b28b15670b..aeca8da96b 100644 --- a/hw/xen_nic.c +++ b/hw/xen_nic.c @@ -433,7 +433,7 @@ struct XenDevOps xen_netdev_ops = { .size = sizeof(struct XenNetDev), .flags = DEVOPS_FLAG_NEED_GNTDEV, .init = net_init, - .connect = net_connect, + .initialise = net_connect, .event = net_event, .disconnect = net_disconnect, .free = net_free, |