From 064676589ca4b5aadd9dfdb1cf95aaca7f8f1a6e Mon Sep 17 00:00:00 2001
From: Alexey Dobriyan <adobriyan@gmail.com>
Date: Fri, 6 Jan 2006 13:24:54 -0800
Subject: [PATCH] --- yaml --- r: 16669 b: refs/heads/master c:
 a2167dc62e9142b9a4bfb20f7e001c0f0a26fd8c h: refs/heads/master i:   16667:
 151e1562e40330e66e76d00ffd9c1cb8a8e6502d v: v3

---
 [refs]                     | 2 +-
 trunk/include/linux/inet.h | 2 +-
 trunk/net/core/utils.c     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index cd20809f4adf..6d36a27e7070 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 76ab608d86cf1ef5c5c46819b5733eb9f9f964f8
+refs/heads/master: a2167dc62e9142b9a4bfb20f7e001c0f0a26fd8c
diff --git a/trunk/include/linux/inet.h b/trunk/include/linux/inet.h
index 3b5e9fdff872..6c5587af118d 100644
--- a/trunk/include/linux/inet.h
+++ b/trunk/include/linux/inet.h
@@ -45,6 +45,6 @@
 #ifdef __KERNEL__
 #include <linux/types.h>
 
-extern __u32 in_aton(const char *str);
+extern __be32 in_aton(const char *str);
 #endif
 #endif	/* _LINUX_INET_H */
diff --git a/trunk/net/core/utils.c b/trunk/net/core/utils.c
index 587eb7787deb..ac1d1fcf8673 100644
--- a/trunk/net/core/utils.c
+++ b/trunk/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;