diff options
| author | James Bottomley <jejb@titanic.(none)> | 2005-05-20 16:27:44 -0400 |
|---|---|---|
| committer | James Bottomley <jejb@titanic.(none)> | 2005-05-20 16:27:44 -0400 |
| commit | ad34ea2cc3845ef4dcd7d12fb0fa8484734bd672 (patch) | |
| tree | ad434400f5ecaa33b433c8f830e40792d8d6c05c /net/ipv4/af_inet.c | |
| parent | 90356ac3194bf91a441a5f9c3067af386ef62462 (diff) | |
| parent | 88d7bd8cb9eb8d64bf7997600b0d64f7834047c5 (diff) | |
merge by hand - fix up rejections in Documentation/DocBook/Makefile
Diffstat (limited to 'net/ipv4/af_inet.c')
| -rw-r--r-- | net/ipv4/af_inet.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c index c34dab67e461..b3cb49ce5fad 100644 --- a/net/ipv4/af_inet.c +++ b/net/ipv4/af_inet.c | |||
| @@ -7,7 +7,7 @@ | |||
| 7 | * | 7 | * |
| 8 | * Version: $Id: af_inet.c,v 1.137 2002/02/01 22:01:03 davem Exp $ | 8 | * Version: $Id: af_inet.c,v 1.137 2002/02/01 22:01:03 davem Exp $ |
| 9 | * | 9 | * |
| 10 | * Authors: Ross Biro, <bir7@leland.Stanford.Edu> | 10 | * Authors: Ross Biro |
| 11 | * Fred N. van Kempen, <waltje@uWalt.NL.Mugnet.ORG> | 11 | * Fred N. van Kempen, <waltje@uWalt.NL.Mugnet.ORG> |
| 12 | * Florian La Roche, <flla@stud.uni-sb.de> | 12 | * Florian La Roche, <flla@stud.uni-sb.de> |
| 13 | * Alan Cox, <A.Cox@swansea.ac.uk> | 13 | * Alan Cox, <A.Cox@swansea.ac.uk> |
| @@ -73,7 +73,6 @@ | |||
| 73 | #include <linux/socket.h> | 73 | #include <linux/socket.h> |
| 74 | #include <linux/in.h> | 74 | #include <linux/in.h> |
| 75 | #include <linux/kernel.h> | 75 | #include <linux/kernel.h> |
| 76 | #include <linux/major.h> | ||
| 77 | #include <linux/module.h> | 76 | #include <linux/module.h> |
| 78 | #include <linux/sched.h> | 77 | #include <linux/sched.h> |
| 79 | #include <linux/timer.h> | 78 | #include <linux/timer.h> |