Merge remote-tracking branch 'remotes/jnsnow/tags/ide-pull-request' into staging

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

diff --git a/hw/net/ne2000.h b/hw/net/ne2000.h
index b31ae030f9a00e8192f501e5a5203cecc5429ef9..d022b28fc240480f2971c95d07eb0f24c34b5d00 100644 (file)
--- a/hw/net/ne2000.h
+++ b/hw/net/ne2000.h
@@ -31,10 +31,9 @@ typedef struct NE2000State {
     uint8_t mem[NE2000_MEM_SIZE];
 } NE2000State;
 
-void ne2000_setup_io(NE2000State *s, unsigned size);
+void ne2000_setup_io(NE2000State *s, DeviceState *dev, unsigned size);
 extern const VMStateDescription vmstate_ne2000;
 void ne2000_reset(NE2000State *s);
-int ne2000_can_receive(NetClientState *nc);
 ssize_t ne2000_receive(NetClientState *nc, const uint8_t *buf, size_t size_);
 
 #endif