Merge branch 'for-linus' of git://git.kernel.dk/data/git/linux-2.6-block

[linux-2.6-omap-h63xx.git] / include / net / rawv6.h

diff --git a/include/net/rawv6.h b/include/net/rawv6.h
index 14476a71725e56467fe934611d3ec2f7e659abb6..af8960878ef41c72df5238a2304fc6bca643ef94 100644 (file)
--- a/include/net/rawv6.h
+++ b/include/net/rawv6.h
@@ -21,7 +21,7 @@ extern void                   rawv6_err(struct sock *sk,
                                          struct sk_buff *skb,
                                          struct inet6_skb_parm *opt,
                                          int type, int code, 
-                                         int offset, u32 info);
+                                         int offset, __be32 info);
 
 #endif