smc91c111: intermediate merge fixup
commitc3ff5ec9be9ad1d928bd5e5bf62e7658229edad4
authorMark McLoughlin <markmc@redhat.com>
Wed, 28 Oct 2009 11:20:57 +0000 (28 11:20 +0000)
committerMark McLoughlin <markmc@redhat.com>
Wed, 28 Oct 2009 11:20:57 +0000 (28 11:20 +0000)
tree8e2a1f3cbb25d73b5d3b8a9adfa1d39a06823a18
parent7522c4a442ed98850062b610a3e061580ee45bf3
smc91c111: intermediate merge fixup

This commit doesn't build:

    commit 50132156
    smc91c111: 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/smc91c111.c