diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-29 20:36:46 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-29 20:36:46 -0400 |
| commit | 826509f8110049663799bc20f2b5b6170e2f78ca (patch) | |
| tree | 9d8823cf283592625b882125b4b13988f2934cc6 /fs | |
| parent | d992895ba2b27cf5adf1ba0ad6d27662adc54c5e (diff) | |
| parent | c530cfb1ce1e8f230744c3f3bd86771f50725053 (diff) | |
Merge HEAD from master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6.git
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/smbfs/sock.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/smbfs/sock.c b/fs/smbfs/sock.c index 93f3cd22a2..6815b1b12b 100644 --- a/fs/smbfs/sock.c +++ b/fs/smbfs/sock.c | |||
| @@ -15,12 +15,12 @@ | |||
| 15 | #include <linux/file.h> | 15 | #include <linux/file.h> |
| 16 | #include <linux/in.h> | 16 | #include <linux/in.h> |
| 17 | #include <linux/net.h> | 17 | #include <linux/net.h> |
| 18 | #include <linux/tcp.h> | ||
| 19 | #include <linux/mm.h> | 18 | #include <linux/mm.h> |
| 20 | #include <linux/netdevice.h> | 19 | #include <linux/netdevice.h> |
| 21 | #include <linux/smp_lock.h> | 20 | #include <linux/smp_lock.h> |
| 22 | #include <linux/workqueue.h> | 21 | #include <linux/workqueue.h> |
| 23 | #include <net/scm.h> | 22 | #include <net/scm.h> |
| 23 | #include <net/tcp_states.h> | ||
| 24 | #include <net/ip.h> | 24 | #include <net/ip.h> |
| 25 | 25 | ||
| 26 | #include <linux/smb_fs.h> | 26 | #include <linux/smb_fs.h> |