ne2k_isa: intermediate merge fixup
commitc5d7754d8714fb20c2a2f7040ff7c8677d86c107
authorMark McLoughlin <markmc@redhat.com>
Wed, 28 Oct 2009 10:57:58 +0000 (28 10:57 +0000)
committerMark McLoughlin <markmc@redhat.com>
Wed, 28 Oct 2009 10:57:58 +0000 (28 10:57 +0000)
treebf6afcb4ef6bcc51c7634e7a167f392bdf86edf2
parent3deaf5aa6ab23d2f8b0250ea63908a30ff2726af
ne2k_isa: intermediate merge fixup

This commit doesn't build:

    commit 93db6685
    ne2k_isa: use qdev properties for configuration.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
because NET_CLIENT_TYPE_NIC isn't yet defined and qemu_new_vlan_client()
doesn't yet have a receive_raw parameter.

Signed-off-by: Mark McLoughlin <markmc@redhat.com>
hw/ne2000-isa.c