diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-08-25 08:39:12 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-08-25 08:39:12 -0400 |
| commit | f58899bb0224741eb0409ada67ecafe90ba137ef (patch) | |
| tree | 78284f77021e830b32e77071dd2ef4e5ccdaa289 /drivers/net/bnx2x_main.c | |
| parent | a2bd7274b47124d2fc4dfdb8c0591f545ba749dd (diff) | |
| parent | 83097aca8567a0bd593534853b71fe0fa9a75d69 (diff) | |
Merge branch 'linus' into x86/urgent
Diffstat (limited to 'drivers/net/bnx2x_main.c')
| -rw-r--r-- | drivers/net/bnx2x_main.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/bnx2x_main.c b/drivers/net/bnx2x_main.c index 3e7dc171cdf1..971576b43687 100644 --- a/drivers/net/bnx2x_main.c +++ b/drivers/net/bnx2x_main.c | |||
| @@ -44,7 +44,6 @@ | |||
| 44 | #include <net/ip.h> | 44 | #include <net/ip.h> |
| 45 | #include <net/tcp.h> | 45 | #include <net/tcp.h> |
| 46 | #include <net/checksum.h> | 46 | #include <net/checksum.h> |
| 47 | #include <linux/version.h> | ||
| 48 | #include <net/ip6_checksum.h> | 47 | #include <net/ip6_checksum.h> |
| 49 | #include <linux/workqueue.h> | 48 | #include <linux/workqueue.h> |
| 50 | #include <linux/crc32.h> | 49 | #include <linux/crc32.h> |