drm: merge Linux master into HEAD

[~andy/linux] / include / net / transp_v6.h

diff --git a/include/net/transp_v6.h b/include/net/transp_v6.h
index 876b6f2bb4fd7a28a641ff038d0eaf3765355ff1..bfb240c6cf795cb10a1c438db0fcec750c0da046 100644 (file)
--- a/include/net/transp_v6.h
+++ b/include/net/transp_v6.h
@@ -46,7 +46,7 @@ extern int                    datagram_send_ctl(struct net *net,
                                                  struct ipv6_txoptions *opt,
                                                  int *hlimit, int *tclass);
 
-#define                LOOPBACK4_IPV6          __constant_htonl(0x7f000006)
+#define                LOOPBACK4_IPV6          cpu_to_be32(0x7f000006)
 
 /*
  *     address family specific functions