diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-07-03 13:49:45 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-07-03 13:49:45 -0400 |
| commit | 026477c1141b67e98e3bd8bdedb7d4b88a3ecd09 (patch) | |
| tree | 2624a44924c625c367f3cebf937853b9da2de282 /net/socket.c | |
| parent | 9f2fa466383ce100b90fe52cb4489d7a26bf72a9 (diff) | |
| parent | 29454dde27d8e340bb1987bad9aa504af7081eba (diff) | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Diffstat (limited to 'net/socket.c')
| -rw-r--r-- | net/socket.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/socket.c b/net/socket.c index 565f5e8d1191..b4848ce0d6ac 100644 --- a/net/socket.c +++ b/net/socket.c | |||
| @@ -58,7 +58,6 @@ | |||
| 58 | * Based upon Swansea University Computer Society NET3.039 | 58 | * Based upon Swansea University Computer Society NET3.039 |
| 59 | */ | 59 | */ |
| 60 | 60 | ||
| 61 | #include <linux/config.h> | ||
| 62 | #include <linux/mm.h> | 61 | #include <linux/mm.h> |
| 63 | #include <linux/smp_lock.h> | 62 | #include <linux/smp_lock.h> |
| 64 | #include <linux/socket.h> | 63 | #include <linux/socket.h> |