diff options
| author | Paul Mackerras | 2006-12-04 05:59:07 +0100 |
|---|---|---|
| committer | Paul Mackerras | 2006-12-04 05:59:07 +0100 |
| commit | 79acbb3ff2d8095b692e1502b9eb2ccec348de26 (patch) | |
| tree | 6ab773e5a8f9de2cd6443362b21d0d6fffe3b35e /include/net/rawv6.h | |
| parent | [PATCH] ppc: Fix io.h for config with CONFIG_PCI not set (diff) | |
| parent | [XFRM]: Fix aevent structuring to be more complete. (diff) | |
| download | kernel-qcow2-linux-79acbb3ff2d8095b692e1502b9eb2ccec348de26.tar.gz kernel-qcow2-linux-79acbb3ff2d8095b692e1502b9eb2ccec348de26.tar.xz kernel-qcow2-linux-79acbb3ff2d8095b692e1502b9eb2ccec348de26.zip | |
Merge branch 'linux-2.6' into for-linus
Diffstat (limited to 'include/net/rawv6.h')
| -rw-r--r-- | include/net/rawv6.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/rawv6.h b/include/net/rawv6.h index 14476a71725e..af8960878ef4 100644 --- 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 |