diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-04-26 03:08:27 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-04-26 03:08:27 -0400 |
| commit | e19553427c2e8fdb04fdd98e407164bb59a840ba (patch) | |
| tree | 5332234b2dad07c03c27e4608afb16f297f41e61 /drivers/net/tokenring/lanstreamer.c | |
| parent | 35f6cd4a06432034665a1499ca4b022437423aac (diff) | |
| parent | 83515bc7df812555e20cda48614674e2f346f9f5 (diff) | |
Merge branch 'sh/stable-updates'
Conflicts:
arch/sh/kernel/dwarf.c
drivers/dma/shdma.c
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'drivers/net/tokenring/lanstreamer.c')
| -rw-r--r-- | drivers/net/tokenring/lanstreamer.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/tokenring/lanstreamer.c b/drivers/net/tokenring/lanstreamer.c index dd028fee9dc2..7a5fbf5a9d71 100644 --- a/drivers/net/tokenring/lanstreamer.c +++ b/drivers/net/tokenring/lanstreamer.c | |||
| @@ -121,6 +121,7 @@ | |||
| 121 | #include <linux/spinlock.h> | 121 | #include <linux/spinlock.h> |
| 122 | #include <linux/bitops.h> | 122 | #include <linux/bitops.h> |
| 123 | #include <linux/jiffies.h> | 123 | #include <linux/jiffies.h> |
| 124 | #include <linux/slab.h> | ||
| 124 | 125 | ||
| 125 | #include <net/net_namespace.h> | 126 | #include <net/net_namespace.h> |
| 126 | #include <net/checksum.h> | 127 | #include <net/checksum.h> |