summaryrefslogtreecommitdiffstats
path: root/drivers/net/bnx2x_link.c
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2008-08-26 07:45:37 +0200
committerH. Peter Anvin <hpa@zytor.com>2008-08-26 07:45:37 +0200
commit94d4ac2f4a58c6e37876827c6688c61cef21290c (patch)
tree732f4e4794f3c116041242f69754637f75c0dd57 /drivers/net/bnx2x_link.c
parentx86: cleanup in amd_cpu_notify() (diff)
parentx86: msr: fix bogus return values from rdmsr_safe/wrmsr_safe (diff)
downloadlinux-94d4ac2f4a58c6e37876827c6688c61cef21290c.tar.xz
linux-94d4ac2f4a58c6e37876827c6688c61cef21290c.zip
Merge branch 'x86/urgent' into x86/cleanups
Diffstat (limited to 'drivers/net/bnx2x_link.c')
-rw-r--r--drivers/net/bnx2x_link.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/bnx2x_link.c b/drivers/net/bnx2x_link.c
index 8b92c6ad0759..4ce7fe9c5251 100644
--- a/drivers/net/bnx2x_link.c
+++ b/drivers/net/bnx2x_link.c
@@ -21,7 +21,6 @@
#include <linux/delay.h>
#include <linux/ethtool.h>
#include <linux/mutex.h>
-#include <linux/version.h>
#include "bnx2x_reg.h"
#include "bnx2x_fw_defs.h"