diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-08-25 04:54:07 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-08-25 04:54:07 -0400 |
| commit | e4f807c2b4d81636fc63993368646c5bfd42b22f (patch) | |
| tree | 2ff100911b1ba4e26e3d9aad41edb9b48405f01e /drivers/net/bnx2x_link.c | |
| parent | 25258ef762bc4a05fa9c4523f7dae56e3fd01864 (diff) | |
| parent | 83097aca8567a0bd593534853b71fe0fa9a75d69 (diff) | |
Merge branch 'linus' into x86/xen
Conflicts:
arch/x86/kernel/paravirt.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/net/bnx2x_link.c')
| -rw-r--r-- | drivers/net/bnx2x_link.c | 1 |
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 @@ | |||
| 21 | #include <linux/delay.h> | 21 | #include <linux/delay.h> |
| 22 | #include <linux/ethtool.h> | 22 | #include <linux/ethtool.h> |
| 23 | #include <linux/mutex.h> | 23 | #include <linux/mutex.h> |
| 24 | #include <linux/version.h> | ||
| 25 | 24 | ||
| 26 | #include "bnx2x_reg.h" | 25 | #include "bnx2x_reg.h" |
| 27 | #include "bnx2x_fw_defs.h" | 26 | #include "bnx2x_fw_defs.h" |