Merge tag 'r8169-20060920-00' of git://electric-eye.fr.zoreil.com/home/romieu/linux...

[pandora-kernel.git] / drivers / net / acenic.h

diff --git a/drivers/net/acenic.h b/drivers/net/acenic.h
index 62ec8ce..efb14b9 100644 (file)
--- 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, &regs->MaskInt);
        else