omap: i2c: add a timeout to the busy waiting

[safe/jmp/linux-2.6] / drivers / net / acenic.h

diff --git a/drivers/net/acenic.h b/drivers/net/acenic.h
index 4487f32..17079b9 100644 (file)
--- a/drivers/net/acenic.h
+++ b/drivers/net/acenic.h
@@ -694,6 +694,10 @@ struct ace_private
        u32                     last_tx, last_std_rx, last_mini_rx;
 #endif
        int                     pci_using_dac;
+       u8                      firmware_major;
+       u8                      firmware_minor;
+       u8                      firmware_fix;
+       u32                     firmware_start;
 };
 
 
@@ -771,7 +775,8 @@ static void ace_load_jumbo_rx_ring(struct ace_private *ap, int nr_bufs);
 static irqreturn_t ace_interrupt(int irq, void *dev_id);
 static int ace_load_firmware(struct net_device *dev);
 static int ace_open(struct net_device *dev);
-static int ace_start_xmit(struct sk_buff *skb, struct net_device *dev);
+static netdev_tx_t ace_start_xmit(struct sk_buff *skb,
+                                 struct net_device *dev);
 static int ace_close(struct net_device *dev);
 static void ace_tasklet(unsigned long dev);
 static void ace_dump_trace(struct ace_private *ap);