Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[linux-2.6] / arch / sh / lib / div64.S

diff --git a/arch/sh/lib/div64.S b/arch/sh/lib/div64.S
index eefc275d64a76135d4f8295f658a6673b9f2a318..5ee7334ea64ff7ff4e68a32f24a5161c8f195a71 100644 (file)
--- a/arch/sh/lib/div64.S
+++ b/arch/sh/lib/div64.S
@@ -1,12 +1,12 @@
 /*     
- * unsigned long long __xdiv64_32(unsigned long long n, unsigned long d); 
+ * unsigned long __xdiv64_32(unsigned long long n, unsigned long d); 
  */
 
 #include <linux/linkage.h>
 
 .text
 ENTRY(__xdiv64_32)
-#ifdef  __LITTLE_ENDIAN__
+#ifdef CONFIG_CPU_LITTLE_ENDIAN
        mov     r4, r0
        mov     r5, r1
 #else
@@ -34,7 +34,7 @@ ENTRY(__xdiv64_32)
        rotcl   r0
        div1    r6, r1
        .endr
-#ifdef  __LITTLE_ENDIAN__
+#ifdef CONFIG_CPU_LITTLE_ENDIAN
        mov     r2, r1
        rts
         rotcl  r0