diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2006-09-27 19:57:54 +0100 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-09-27 19:57:54 +0100 |
commit | 2dc94310bd94d0906febea7d0f7c188da620c952 (patch) | |
tree | 6de4096f1887e2c00966177354b1c378e59bd632 /drivers/net/sgiseeq.h | |
parent | c06015148fa9a3cc452ec7121b8c3f59f4a7d6ac (diff) | |
parent | fb60cf4ab52f3520c2119aa42f7d4ed8e7594eb6 (diff) |
Merge master.kernel.org:/pub/scm/linux/kernel/git/tmlind/linux-omap-upstream into devel
Diffstat (limited to 'drivers/net/sgiseeq.h')
-rw-r--r-- | drivers/net/sgiseeq.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/sgiseeq.h b/drivers/net/sgiseeq.h index ebcca688dac..523104de683 100644 --- a/drivers/net/sgiseeq.h +++ b/drivers/net/sgiseeq.h @@ -16,7 +16,7 @@ struct sgiseeq_rregs { volatile unsigned int collision_tx[2]; volatile unsigned int collision_all[2]; volatile unsigned int _unused0; - volatile unsigned int rflags; + volatile unsigned int rflags; }; struct sgiseeq_regs { @@ -73,7 +73,7 @@ struct sgiseeq_regs { #define SEEQ_TCMD_IC 0x02 /* IRQ on collisions */ #define SEEQ_TCMD_I16 0x04 /* IRQ after 16 failed attempts to tx frame */ #define SEEQ_TCMD_IPT 0x08 /* IRQ when packet successfully transmitted */ -#define SEEQ_TCMD_RB1 0x20 /* Register bank one w/multi-cast low byte */ +#define SEEQ_TCMD_RB1 0x20 /* Register bank one w/multi-cast low byte */ #define SEEQ_TCMD_RB2 0x40 /* Register bank two w/multi-cast high byte */ /* Seeq8003 control register */ |