Pull release into acpica branch

[linux-2.6] / net / core / utils.c

diff --git a/net/core/utils.c b/net/core/utils.c
index 587eb7787debf04561517a0e0f0a070d5bff84e3..ac1d1fcf8673f63158691ee0004952b803206f84 100644 (file)
--- a/net/core/utils.c
+++ b/net/core/utils.c
@@ -162,7 +162,7 @@ EXPORT_SYMBOL(net_srandom);
  * is otherwise not dependent on the TCP/IP stack.
  */
 
-__u32 in_aton(const char *str)
+__be32 in_aton(const char *str)
 {
        unsigned long l;
        unsigned int val;