summaryrefslogtreecommitdiffstats
path: root/drivers/net/acenic.h
diff options
context:
space:
mode:
authorSteven Whitehouse <swhiteho@redhat.com>2006-09-25 12:26:59 -0400
committerSteven Whitehouse <swhiteho@redhat.com>2006-09-25 12:26:59 -0400
commit363e065c02b1273364d5356711a83e7f548fc0c8 (patch)
tree0df0e65da403ade33ade580c2770c97437b1b1af /drivers/net/acenic.h
parent907b9bceb41fa46beae93f79cc4a2247df502c0f (diff)
parent7c250413e5b7c3dfae89354725b70c76d7621395 (diff)
downloadlinux-363e065c02b1273364d5356711a83e7f548fc0c8.tar.gz
linux-363e065c02b1273364d5356711a83e7f548fc0c8.tar.bz2
linux-363e065c02b1273364d5356711a83e7f548fc0c8.zip
[GFS2] Fix up merge of Linus' kernel into GFS2
This fixes up a couple of conflicts when merging up with Linus' latest kernel. This will hopefully allow GFS2 to be more easily merged into forthcoming -mm and FC kernels due to the "one line per header" format now used for the kernel headers. Signed-off-by: Steven Whitehouse <swhiteho@redhat.com> Conflicts: include/linux/Kbuild include/linux/kernel.h
Diffstat (limited to 'drivers/net/acenic.h')
-rw-r--r--drivers/net/acenic.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/acenic.h b/drivers/net/acenic.h
index 62ec8ceee698..efb14b9f4d90 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, &regs->MaskInt);
else