Merge remote-tracking branch 'remotes/borntraeger/tags/s390x-20151006' into staging

[qemu.git] / hw / net / pcnet.h

diff --git a/hw/net/pcnet.h b/hw/net/pcnet.h
index f8e8a6f6ba08e5ef57ad1d4a04691d5431b7d1cf..dec8de834c26552b584c80f9c27b648b80950431 100644 (file)
--- a/hw/net/pcnet.h
+++ b/hw/net/pcnet.h
@@ -60,10 +60,8 @@ uint32_t pcnet_ioport_readw(void *opaque, uint32_t addr);
 void pcnet_ioport_writel(void *opaque, uint32_t addr, uint32_t val);
 uint32_t pcnet_ioport_readl(void *opaque, uint32_t addr);
 uint32_t pcnet_bcr_readw(PCNetState *s, uint32_t rap);
-int pcnet_can_receive(NetClientState *nc);
 ssize_t pcnet_receive(NetClientState *nc, const uint8_t *buf, size_t size_);
 void pcnet_set_link_status(NetClientState *nc);
-void pcnet_common_cleanup(PCNetState *d);
-int pcnet_common_init(DeviceState *dev, PCNetState *s, NetClientInfo *info);
+void pcnet_common_init(DeviceState *dev, PCNetState *s, NetClientInfo *info);
 extern const VMStateDescription vmstate_pcnet;
 #endif