diff options
| author | Steve French <sfrench@us.ibm.com> | 2008-05-06 13:55:32 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2008-05-06 13:55:32 -0400 |
| commit | a815752ac0ffdb910e92958d41d28f4fb28e5296 (patch) | |
| tree | a3aa16a282354da0debe8e3a3a7ed8aac6e54001 /include/linux/inet.h | |
| parent | 5ade9deaaa3e1f7291467d97b238648e43eae15e (diff) | |
| parent | a15306365a16380f3bafee9e181ba01231d4acd7 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/linux/inet.h')
| -rw-r--r-- | include/linux/inet.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/inet.h b/include/linux/inet.h index 675a7dbe86f8..1354080cf8cf 100644 --- a/include/linux/inet.h +++ b/include/linux/inet.h | |||
| @@ -42,11 +42,9 @@ | |||
| 42 | #ifndef _LINUX_INET_H | 42 | #ifndef _LINUX_INET_H |
| 43 | #define _LINUX_INET_H | 43 | #define _LINUX_INET_H |
| 44 | 44 | ||
| 45 | #ifdef __KERNEL__ | ||
| 46 | #include <linux/types.h> | 45 | #include <linux/types.h> |
| 47 | 46 | ||
| 48 | extern __be32 in_aton(const char *str); | 47 | extern __be32 in_aton(const char *str); |
| 49 | extern int in4_pton(const char *src, int srclen, u8 *dst, int delim, const char **end); | 48 | extern int in4_pton(const char *src, int srclen, u8 *dst, int delim, const char **end); |
| 50 | extern int in6_pton(const char *src, int srclen, u8 *dst, int delim, const char **end); | 49 | extern int in6_pton(const char *src, int srclen, u8 *dst, int delim, const char **end); |
| 51 | #endif | ||
| 52 | #endif /* _LINUX_INET_H */ | 50 | #endif /* _LINUX_INET_H */ |