X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=drivers%2Fnet%2Facenic.h;h=8ca8534d70bf33c56adac5130bd284808ab1a938;hb=15e376b4eed2575b323d575403569ec1b5f63fda;hp=62ec8ceee698f954ff8ab225ba0bf3d0aa141822;hpb=c4e00fac42f268ed0a547cdd1d12bb8399864040;p=linux-2.6-omap-h63xx.git diff --git a/drivers/net/acenic.h b/drivers/net/acenic.h index 62ec8ceee69..8ca8534d70b 100644 --- a/drivers/net/acenic.h +++ b/drivers/net/acenic.h @@ -173,7 +173,7 @@ typedef struct { /* * Host control register bits. */ - + #define IN_INT 0x01 #define CLR_INT 0x02 #define HW_RESET 0x08 @@ -449,7 +449,7 @@ struct cmd { struct tx_desc{ aceaddr addr; - u32 flagsize; + u32 flagsize; #if 0 /* * This is in PCI shared mem and must be accessed with readl/writel @@ -754,7 +754,7 @@ static inline void ace_unmask_irq(struct net_device *dev) { struct ace_private *ap = netdev_priv(dev); struct ace_regs __iomem *regs = ap->regs; - + if (ACE_IS_TIGON_I(ap)) writel(0, ®s->MaskInt); else @@ -769,7 +769,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);