---

yaml --- r: 203770 b: refs/heads/master c: 9f6c925 h: refs/heads/master v: v3
git-mirror · Jul 28, 2010 · 9b09541 · 9b09541
1 parent e1dede1
commit 9b09541
Show file tree

Hide file tree

Showing 6 changed files with 3,093 additions and 2,750 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b0efbb996e8554ed8fe59e3f79e0bc83218083ab
+refs/heads/master: 9f6c925889ad9204c7d1f5ca116d2e5fd6036c72
diff --git a/trunk/drivers/net/bnx2x/Makefile b/trunk/drivers/net/bnx2x/Makefile
@@ -4,4 +4,4 @@
 
 obj-$(CONFIG_BNX2X) += bnx2x.o
 
-bnx2x-objs := bnx2x_main.o bnx2x_link.o
+bnx2x-objs := bnx2x_main.o bnx2x_link.o bnx2x_cmn.o
diff --git a/trunk/drivers/net/bnx2x/bnx2x.h b/trunk/drivers/net/bnx2x/bnx2x.h
@@ -45,6 +45,7 @@
 #endif
 
 #include <linux/mdio.h>
+#include <linux/pci.h>
 #include "bnx2x_reg.h"
 #include "bnx2x_fw_defs.h"
 #include "bnx2x_hsi.h"
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4,4 +4,4 @@

		obj-$(CONFIG_BNX2X) += bnx2x.o

		bnx2x-objs := bnx2x_main.o bnx2x_link.o
		bnx2x-objs := bnx2x_main.o bnx2x_link.o bnx2x_cmn.o