Merge with /home/shaggy/git/linus-clean/

[karo-tx-linux.git] / include / linux / inet.h

diff --git a/include/linux/inet.h b/include/linux/inet.h
index 3b5e9fdff872c5575464208dd8b4fbf8eb665652..6c5587af118d477354d7f738a688babd6524340f 100644 (file)
--- a/include/linux/inet.h
+++ b/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 */