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/ixgbe/ixgbe_main.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/ixgbe/ixgbe_main.c')
| -rw-r--r-- | drivers/net/ixgbe/ixgbe_main.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c index 0c553f6cb534..8f677cb86290 100644 --- a/drivers/net/ixgbe/ixgbe_main.c +++ b/drivers/net/ixgbe/ixgbe_main.c | |||
| @@ -36,6 +36,7 @@ | |||
| 36 | #include <linux/tcp.h> | 36 | #include <linux/tcp.h> |
| 37 | #include <linux/pkt_sched.h> | 37 | #include <linux/pkt_sched.h> |
| 38 | #include <linux/ipv6.h> | 38 | #include <linux/ipv6.h> |
| 39 | #include <linux/slab.h> | ||
| 39 | #include <net/checksum.h> | 40 | #include <net/checksum.h> |
| 40 | #include <net/ip6_checksum.h> | 41 | #include <net/ip6_checksum.h> |
| 41 | #include <linux/ethtool.h> | 42 | #include <linux/ethtool.h> |