diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-06 15:24:28 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-06 15:24:28 -0800 |
commit | d8d8f6a4fd635dcc9e4f946394c1fbde85eeab66 (patch) | |
tree | 0a1bc8ff40c12bb30066467e11ae9153f89514e7 /include/linux/inet.h | |
parent | 57d1c91fa6d9146b309b7511f6432dea2a24858b (diff) | |
parent | a2167dc62e9142b9a4bfb20f7e001c0f0a26fd8c (diff) |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'include/linux/inet.h')
-rw-r--r-- | include/linux/inet.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/inet.h b/include/linux/inet.h index 3b5e9fdff87..6c5587af118 100644 --- 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 */ |