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/dgrs_asstruct.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/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 a8e5bb5ef53..f0e2121770f 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 */ |