diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-05-03 09:25:35 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-05-03 09:25:35 -0400 |
| commit | d6d53cbc6b10d28646fb6184d1069f336ec76dc4 (patch) | |
| tree | 1c844b3ce8bd430becbbb74875898b08d9f89bb5 /drivers/net/s2io.c | |
| parent | 0b5adf92ec793c665b0de63ac146d190a921c391 (diff) | |
| parent | 6a740aa4f47b9f29bad5292cf51f008f3edad9b1 (diff) | |
Merge branch 'hid-suspend' into picolcd
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> |