diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2007-02-20 14:13:30 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2007-02-20 14:13:30 -0500 |
| commit | 5a84d159061d914c8dd4aa372ac6e9529c2be453 (patch) | |
| tree | 9b08af78085334af44414adafe0096276f8fe0ff /arch/m32r/lib/checksum.S | |
| parent | e80a0e6e7ccdf64575d4384cb4172860422f5b81 (diff) | |
| parent | 7d477a04a619e90ee08724e8f2d8803c6bdfcef8 (diff) | |
Merge ARM fixes
Diffstat (limited to 'arch/m32r/lib/checksum.S')
| -rw-r--r-- | arch/m32r/lib/checksum.S | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/m32r/lib/checksum.S b/arch/m32r/lib/checksum.S index cfbe00e5184a..0af0360c76d9 100644 --- a/arch/m32r/lib/checksum.S +++ b/arch/m32r/lib/checksum.S | |||
| @@ -25,8 +25,6 @@ | |||
| 25 | * as published by the Free Software Foundation; either version | 25 | * as published by the Free Software Foundation; either version |
| 26 | * 2 of the License, or (at your option) any later version. | 26 | * 2 of the License, or (at your option) any later version. |
| 27 | */ | 27 | */ |
| 28 | /* $Id$ */ | ||
| 29 | |||
| 30 | 28 | ||
| 31 | #include <linux/linkage.h> | 29 | #include <linux/linkage.h> |
| 32 | #include <asm/assembler.h> | 30 | #include <asm/assembler.h> |
| @@ -319,3 +317,4 @@ ENTRY(csum_partial_copy_generic) | |||
| 319 | nop | 317 | nop |
| 320 | nop | 318 | nop |
| 321 | 319 | ||
| 320 | .end | ||