diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-09-25 12:26:59 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-09-25 12:26:59 -0400 |
| commit | 363e065c02b1273364d5356711a83e7f548fc0c8 (patch) | |
| tree | 0df0e65da403ade33ade580c2770c97437b1b1af /drivers/net/rrunner.h | |
| parent | 907b9bceb41fa46beae93f79cc4a2247df502c0f (diff) | |
| parent | 7c250413e5b7c3dfae89354725b70c76d7621395 (diff) | |
[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/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 2c3c91ebd99f..99451b523399 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; |