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/dgrs_asstruct.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/dgrs_asstruct.h')
| -rw-r--r-- | drivers/net/dgrs_asstruct.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/dgrs_asstruct.h b/drivers/net/dgrs_asstruct.h index a8e5bb5ef534..f0e2121770f1 100644 --- a/drivers/net/dgrs_asstruct.h +++ b/drivers/net/dgrs_asstruct.h @@ -19,7 +19,7 @@ # define S1(t,x) _Off=(_Off+0)&~0; x=_Off; _Off=_Off+1 # define S2(t,x) _Off=(_Off+1)&~1; x=_Off; _Off=_Off+2 # define S4(t,x) _Off=(_Off+3)&~3; x=_Off; _Off=_Off+4 -# define END_STRUCT(x) _Off=(_Off+3)&~3; x=_Off +# define END_STRUCT(x) _Off=(_Off+3)&~3; x=_Off #else /* C */ |