Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1

[linux-2.6.git] / arch / i386 / lib / checksum.S

diff --git a/arch/i386/lib/checksum.S b/arch/i386/lib/checksum.S
index 638b3bf..75ffd02 100644 (file)
--- a/arch/i386/lib/checksum.S
+++ b/arch/i386/lib/checksum.S
@@ -25,7 +25,6 @@
  *             2 of the License, or (at your option) any later version.
  */
 
-#include <linux/config.h>
 #include <asm/errno.h>
                                
 /*
@@ -280,14 +279,14 @@ unsigned int csum_partial_copy_generic (const char *src, char *dst,
        .previous
 
 .align 4
-.globl direct_csum_partial_copy_generic
+.globl csum_partial_copy_generic
                                
 #ifndef CONFIG_X86_USE_PPRO_CHECKSUM
 
 #define ARGBASE 16             
 #define FP             12
                
-direct_csum_partial_copy_generic:
+csum_partial_copy_generic:
        subl  $4,%esp   
        pushl %edi
        pushl %esi
@@ -422,7 +421,7 @@ DST(        movb %cl, (%edi)        )
 
 #define ARGBASE 12
                
-direct_csum_partial_copy_generic:
+csum_partial_copy_generic:
        pushl %ebx
        pushl %edi
        pushl %esi