projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'drm-next-4.4' of git://people.freedesktop.org/~agd5f/linux into drm...
[firefly-linux-kernel-4.4.55.git]
/
arch
/
m32r
/
lib
/
checksum.S
diff --git
a/arch/m32r/lib/checksum.S
b/arch/m32r/lib/checksum.S
index cfbe00e5184a7dcbfb189cfde256942060e9f95f..0af0360c76d9505f2ce1965f3fc9e337830d1f46 100644
(file)
--- a/
arch/m32r/lib/checksum.S
+++ b/
arch/m32r/lib/checksum.S
@@
-25,8
+25,6
@@
* as published by the Free Software Foundation; either version
* 2 of the License, or (at your option) any later version.
*/
* as published by the Free Software Foundation; either version
* 2 of the License, or (at your option) any later version.
*/
-/* $Id$ */
-
#include <linux/linkage.h>
#include <asm/assembler.h>
#include <linux/linkage.h>
#include <asm/assembler.h>
@@
-319,3
+317,4
@@
ENTRY(csum_partial_copy_generic)
nop
nop
nop
nop
+ .end