diff options
Diffstat (limited to 'drivers/net/acenic.h')
-rw-r--r-- | drivers/net/acenic.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/net/acenic.h b/drivers/net/acenic.h index a97107023495..efb14b9f4d90 100644 --- a/drivers/net/acenic.h +++ b/drivers/net/acenic.h | |||
@@ -1,7 +1,6 @@ | |||
1 | #ifndef _ACENIC_H_ | 1 | #ifndef _ACENIC_H_ |
2 | #define _ACENIC_H_ | 2 | #define _ACENIC_H_ |
3 | 3 | ||
4 | #include <linux/config.h> | ||
5 | 4 | ||
6 | /* | 5 | /* |
7 | * Generate TX index update each time, when TX ring is closed. | 6 | * Generate TX index update each time, when TX ring is closed. |
@@ -174,7 +173,7 @@ typedef struct { | |||
174 | /* | 173 | /* |
175 | * Host control register bits. | 174 | * Host control register bits. |
176 | */ | 175 | */ |
177 | 176 | ||
178 | #define IN_INT 0x01 | 177 | #define IN_INT 0x01 |
179 | #define CLR_INT 0x02 | 178 | #define CLR_INT 0x02 |
180 | #define HW_RESET 0x08 | 179 | #define HW_RESET 0x08 |
@@ -450,7 +449,7 @@ struct cmd { | |||
450 | 449 | ||
451 | struct tx_desc{ | 450 | struct tx_desc{ |
452 | aceaddr addr; | 451 | aceaddr addr; |
453 | u32 flagsize; | 452 | u32 flagsize; |
454 | #if 0 | 453 | #if 0 |
455 | /* | 454 | /* |
456 | * This is in PCI shared mem and must be accessed with readl/writel | 455 | * This is in PCI shared mem and must be accessed with readl/writel |
@@ -755,7 +754,7 @@ static inline void ace_unmask_irq(struct net_device *dev) | |||
755 | { | 754 | { |
756 | struct ace_private *ap = netdev_priv(dev); | 755 | struct ace_private *ap = netdev_priv(dev); |
757 | struct ace_regs __iomem *regs = ap->regs; | 756 | struct ace_regs __iomem *regs = ap->regs; |
758 | 757 | ||
759 | if (ACE_IS_TIGON_I(ap)) | 758 | if (ACE_IS_TIGON_I(ap)) |
760 | writel(0, ®s->MaskInt); | 759 | writel(0, ®s->MaskInt); |
761 | else | 760 | else |