upgrade to linux 2.6.10-1.12_FC2

[linux-2.6.git] / include / asm-sh / checksum.h

diff --git a/include/asm-sh/checksum.h b/include/asm-sh/checksum.h
index 512ffe6..f1874a1 100644 (file)
--- a/include/asm-sh/checksum.h
+++ b/include/asm-sh/checksum.h
@@ -10,6 +10,7 @@
  */
 
 #include <linux/config.h>
+#include <linux/in6.h>
 
 /*
  * computes the checksum of a memory block at buff, length len,
@@ -159,7 +160,6 @@ static __inline__ unsigned short ip_compute_csum(unsigned char * buff, int len)
 }
 
 #define _HAVE_ARCH_IPV6_CSUM
-#ifdef CONFIG_IPV6
 static __inline__ unsigned short int csum_ipv6_magic(struct in6_addr *saddr,
                                                     struct in6_addr *daddr,
                                                     __u32 len,
@@ -195,7 +195,6 @@ static __inline__ unsigned short int csum_ipv6_magic(struct in6_addr *saddr,
 
        return csum_fold(sum);
 }
-#endif
 
 /* 
  *     Copy and checksum to user