diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2006-09-24 22:05:59 +0100 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-09-24 22:05:59 +0100 |
| commit | 02b25fcff676125a88169c8a78d4c6dd647574ed (patch) | |
| tree | 372fc8e885be41ba1819b2767c8889ecd97ff948 /drivers/net/rrunner.h | |
| parent | 1694176a210189312e31b083bac1e1688981219a (diff) | |
| parent | a68aa1cc6f3203b8a332683ebde67a00f39eec43 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/net/rrunner.h')
| -rw-r--r-- | drivers/net/rrunner.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/rrunner.h b/drivers/net/rrunner.h index 2c3c91ebd99..99451b52339 100644 --- a/drivers/net/rrunner.h +++ b/drivers/net/rrunner.h @@ -167,7 +167,7 @@ struct rr_regs { /* * Host control register bits. */ - + #define RR_INT 0x01 #define RR_CLEAR_INT 0x02 #define NO_SWAP 0x04000004 @@ -238,9 +238,9 @@ struct rr_regs { /* * Receive state * - * RoadRunner HIPPI Receive State Register controls and monitors the + * RoadRunner HIPPI Receive State Register controls and monitors the * HIPPI receive interface in the NIC. Look at err bits when a HIPPI - * receive Error Event occurs. + * receive Error Event occurs. */ #define ENABLE_NEW_CON 0x01 @@ -700,7 +700,7 @@ struct rr_stats { u32 StatUpdtT; u32 StatUpdtC; u32 WatchDog; - u32 Trace; + u32 Trace; /* Serial HIPPI */ u32 LnkRdyEst; |