[GFS2] Fix up merge of Linus' kernel into GFS2

[pandora-kernel.git] / include / linux / inet.h

diff --git a/include/linux/inet.h b/include/linux/inet.h
index 6c5587a..b7c6da7 100644 (file)
--- a/include/linux/inet.h
+++ b/include/linux/inet.h
@@ -46,5 +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);
 #endif
 #endif /* _LINUX_INET_H */