diff options
author | Jody McIntyre <scjody@modernduck.com> | 2006-01-05 08:03:40 -0500 |
---|---|---|
committer | Jody McIntyre <scjody@modernduck.com> | 2006-01-05 08:03:40 -0500 |
commit | 0a75c23a009ff65f651532cecc16675d05f4de37 (patch) | |
tree | bdcd6158758fe1810f0ddddb80d2816779518688 /fs/9p | |
parent | 34b8c399dc04c8e51f014b73458e654570698597 (diff) | |
parent | db9edfd7e339ca4113153d887e782dd05be5a9eb (diff) |
Merge with http://kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'fs/9p')
-rw-r--r-- | fs/9p/trans_sock.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/9p/trans_sock.c b/fs/9p/trans_sock.c index a93c2bf94c..6a9a75d40f 100644 --- a/fs/9p/trans_sock.c +++ b/fs/9p/trans_sock.c | |||
@@ -26,6 +26,7 @@ | |||
26 | */ | 26 | */ |
27 | 27 | ||
28 | #include <linux/config.h> | 28 | #include <linux/config.h> |
29 | #include <linux/in.h> | ||
29 | #include <linux/module.h> | 30 | #include <linux/module.h> |
30 | #include <linux/net.h> | 31 | #include <linux/net.h> |
31 | #include <linux/ipv6.h> | 32 | #include <linux/ipv6.h> |