diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-03-28 16:29:51 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-03-28 16:29:51 -0400 |
| commit | ed40d0c472b136682b2fcba05f89762859c7374f (patch) | |
| tree | 076b83a26bcd63d6158463735dd34c10bbc591dc /include/net/transp_v6.h | |
| parent | 9e495834e59ca9b29f1a1f63b9f5533bb022ac49 (diff) | |
| parent | 5d80f8e5a9dc9c9a94d4aeaa567e219a808b8a4a (diff) | |
Merge branch 'origin' into devel
Conflicts:
sound/soc/pxa/pxa2xx-i2s.c
Diffstat (limited to 'include/net/transp_v6.h')
| -rw-r--r-- | include/net/transp_v6.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/transp_v6.h b/include/net/transp_v6.h index 876b6f2bb4fd..bfb240c6cf79 100644 --- a/include/net/transp_v6.h +++ b/include/net/transp_v6.h | |||
| @@ -46,7 +46,7 @@ extern int datagram_send_ctl(struct net *net, | |||
| 46 | struct ipv6_txoptions *opt, | 46 | struct ipv6_txoptions *opt, |
| 47 | int *hlimit, int *tclass); | 47 | int *hlimit, int *tclass); |
| 48 | 48 | ||
| 49 | #define LOOPBACK4_IPV6 __constant_htonl(0x7f000006) | 49 | #define LOOPBACK4_IPV6 cpu_to_be32(0x7f000006) |
| 50 | 50 | ||
| 51 | /* | 51 | /* |
| 52 | * address family specific functions | 52 | * address family specific functions |