rtl8139: intermediate merge fixup
commit68e74b1e620c31faabd9d8ef72d13700c6640858
authorMark McLoughlin <markmc@redhat.com>
Wed, 28 Oct 2009 11:15:51 +0000 (28 11:15 +0000)
committerMark McLoughlin <markmc@redhat.com>
Wed, 28 Oct 2009 11:15:51 +0000 (28 11:15 +0000)
treee84ce50865d75cf1fe2bc4d652fd6e1ac5590de6
parent0c42576b3e16c50c601bb4f4a9945d6568c6f455
rtl8139: intermediate merge fixup

This commit doesn't build:

    commit 254111ec
    rtl8139: 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/rtl8139.c