Merge branch 'linux-2.6'

[linux.git] / include / linux / inet.h

diff --git a/include/linux/inet.h b/include/linux/inet.h
index b7c6da7d6d32466eac48edaf919b2182dbb8025d..675a7dbe86f876d68cbd7d9573b74e305e7091d8 100644 (file)
--- a/include/linux/inet.h
+++ b/include/linux/inet.h
@@ -46,7 +46,7 @@
 #include <linux/types.h>
 
 extern __be32 in_aton(const char *str);
-extern int in4_pton(const char *src, int srclen, u8 *dst, char delim, const char **end);
-extern int in6_pton(const char *src, int srclen, u8 *dst, char delim, const char **end);
+extern int in4_pton(const char *src, int srclen, u8 *dst, int delim, const char **end);
+extern int in6_pton(const char *src, int srclen, u8 *dst, int delim, const char **end);
 #endif
 #endif /* _LINUX_INET_H */