diff options
| author | Jeff Garzik <jeff@garzik.org> | 2007-02-17 15:11:43 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-02-17 15:11:43 -0500 |
| commit | f630fe2817601314b2eb7ca5ddc23c7834646731 (patch) | |
| tree | 3bfb4939b7bbc3859575ca8b58fa3f929b015941 /net/ipv6/af_inet6.c | |
| parent | 48c871c1f6a7c7044dd76774fb469e65c7e2e4e8 (diff) | |
| parent | 8a03d9a498eaf02c8a118752050a5154852c13bf (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'net/ipv6/af_inet6.c')
| -rw-r--r-- | net/ipv6/af_inet6.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c index a006d242be76..3585d8fa7f02 100644 --- a/net/ipv6/af_inet6.c +++ b/net/ipv6/af_inet6.c | |||
| @@ -28,7 +28,6 @@ | |||
| 28 | #include <linux/socket.h> | 28 | #include <linux/socket.h> |
| 29 | #include <linux/in.h> | 29 | #include <linux/in.h> |
| 30 | #include <linux/kernel.h> | 30 | #include <linux/kernel.h> |
| 31 | #include <linux/sched.h> | ||
| 32 | #include <linux/timer.h> | 31 | #include <linux/timer.h> |
| 33 | #include <linux/string.h> | 32 | #include <linux/string.h> |
| 34 | #include <linux/sockios.h> | 33 | #include <linux/sockios.h> |