diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2010-05-17 19:30:58 -0400 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2010-05-17 19:30:58 -0400 |
| commit | 0b28330e39bbe0ffee4c56b09fc415fcec595ea3 (patch) | |
| tree | fcf504879883763557e696eff81427b1ab78f76b /drivers/net/s2io.c | |
| parent | 058276303dbc4ed089c1f7dad0871810b1f5ddf1 (diff) | |
| parent | caa20d974c86af496b419eef70010e63b7fab7ac (diff) | |
Merge branch 'ioat' into dmaengine
Diffstat (limited to 'drivers/net/s2io.c')
| -rw-r--r-- | drivers/net/s2io.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c index 2eb7f8a0d926..92ae8d3de39b 100644 --- a/drivers/net/s2io.c +++ b/drivers/net/s2io.c | |||
| @@ -79,6 +79,7 @@ | |||
| 79 | #include <linux/tcp.h> | 79 | #include <linux/tcp.h> |
| 80 | #include <linux/uaccess.h> | 80 | #include <linux/uaccess.h> |
| 81 | #include <linux/io.h> | 81 | #include <linux/io.h> |
| 82 | #include <linux/slab.h> | ||
| 82 | #include <net/tcp.h> | 83 | #include <net/tcp.h> |
| 83 | 84 | ||
| 84 | #include <asm/system.h> | 85 | #include <asm/system.h> |