diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-09-25 18:26:59 +0200 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-09-25 18:26:59 +0200 |
| commit | 363e065c02b1273364d5356711a83e7f548fc0c8 (patch) | |
| tree | 0df0e65da403ade33ade580c2770c97437b1b1af /drivers/net/typhoon.h | |
| parent | [GFS2/DLM] Fix trailing whitespace (diff) | |
| parent | [PATCH] pata_pdc2027x iomem annotations (diff) | |
| download | linux-363e065c02b1273364d5356711a83e7f548fc0c8.tar.xz 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/typhoon.h')
| -rw-r--r-- | drivers/net/typhoon.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/typhoon.h b/drivers/net/typhoon.h index 738ee71d8dfb..2f14a050051b 100644 --- a/drivers/net/typhoon.h +++ b/drivers/net/typhoon.h @@ -46,7 +46,7 @@ struct transmit_ring { /* The host<->Typhoon ring index structure * This indicates the current positions in the rings - * + * * All values must be in little endian format for the 3XP * * rxHiCleared: entry we've cleared to in the Hi receive ring @@ -131,7 +131,7 @@ struct typhoon_interface { * * A packet is described by a packet descriptor, followed by option descriptors, * if any, then one or more fragment descriptors. - * + * * Packet descriptor: * flags: Descriptor type * len:i zero, or length of this packet |