ar9170: ar9170: USB frontend driver

[linux-2.6-omap-h63xx.git] / drivers / net / acenic.h

diff --git a/drivers/net/acenic.h b/drivers/net/acenic.h
index efb14b9f4d90360b33dae401a567d316aa6906c8..c987c9b5a137037cfed7a4e8326210104ecff091 100644 (file)
--- a/drivers/net/acenic.h
+++ b/drivers/net/acenic.h
@@ -693,8 +693,11 @@ struct ace_private
                                __attribute__ ((aligned (SMP_CACHE_BYTES)));
        u32                     last_tx, last_std_rx, last_mini_rx;
 #endif
-       struct net_device_stats stats;
        int                     pci_using_dac;
+       u8                      firmware_major;
+       u8                      firmware_minor;
+       u8                      firmware_fix;
+       u32                     firmware_start;
 };
 
 
@@ -769,7 +772,7 @@ static int ace_init(struct net_device *dev);
 static void ace_load_std_rx_ring(struct ace_private *ap, int nr_bufs);
 static void ace_load_mini_rx_ring(struct ace_private *ap, int nr_bufs);
 static void ace_load_jumbo_rx_ring(struct ace_private *ap, int nr_bufs);
-static irqreturn_t ace_interrupt(int irq, void *dev_id, struct pt_regs *regs);
+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);
@@ -787,7 +790,6 @@ static struct net_device_stats *ace_get_stats(struct net_device *dev);
 static int read_eeprom_byte(struct net_device *dev, unsigned long offset);
 #if ACENIC_DO_VLAN
 static void ace_vlan_rx_register(struct net_device *dev, struct vlan_group *grp);
-static void ace_vlan_rx_kill_vid(struct net_device *dev, unsigned short vid);
 #endif
 
 #endif /* _ACENIC_H_ */