---

yaml --- r: 203767 b: refs/heads/master c: 5d1e859 h: refs/heads/master i: 203765: 9c3145b 203763: 88c0249 203759: 003284c v: v3
git-mirror · Jul 28, 2010 · c6e257d · c6e257d
1 parent 7e443f5
commit c6e257d
Show file tree

Hide file tree

Showing 15 changed files with 13 additions and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2c6952dfdda2f266f2f501792b8d6413caf25f7a
+refs/heads/master: 5d1e859c5b600c491336f023a2f2105c24597226
diff --git a/trunk/drivers/net/Makefile b/trunk/drivers/net/Makefile
@@ -84,8 +84,7 @@ obj-$(CONFIG_FEALNX) += fealnx.o
 obj-$(CONFIG_TIGON3) += tg3.o
 obj-$(CONFIG_BNX2) += bnx2.o
 obj-$(CONFIG_CNIC) += cnic.o
-obj-$(CONFIG_BNX2X) += bnx2x.o
-bnx2x-objs := bnx2x_main.o bnx2x_link.o
+obj-$(CONFIG_BNX2X) += bnx2x/
 spidernet-y += spider_net.o spider_net_ethtool.o
 obj-$(CONFIG_SPIDER_NET) += spidernet.o sungem_phy.o
 obj-$(CONFIG_GELIC_NET) += ps3_gelic.o

diff --git a/trunk/drivers/net/bnx2x/Makefile b/trunk/drivers/net/bnx2x/Makefile
@@ -0,0 +1,7 @@
+#
+# Makefile for Broadcom 10-Gigabit ethernet driver
+#
+
+obj-$(CONFIG_BNX2X) += bnx2x.o
+
+bnx2x-objs := bnx2x_main.o bnx2x_link.o
diff --git a/trunk/drivers/net/bnx2x.h → trunk/drivers/net/bnx2x/bnx2x.h b/trunk/drivers/net/bnx2x.h → trunk/drivers/net/bnx2x/bnx2x.h
@@ -32,7 +32,7 @@
 
 #if defined(CONFIG_CNIC) || defined(CONFIG_CNIC_MODULE)
 #define BCM_CNIC 1
-#include "cnic_if.h"
+#include "../cnic_if.h"
 #endif
 
 

diff --git a/trunk/drivers/net/bnx2x_dump.h → trunk/drivers/net/bnx2x/bnx2x_dump.h b/trunk/drivers/net/bnx2x_dump.h → trunk/drivers/net/bnx2x/bnx2x_dump.h
diff --git a/trunk/drivers/net/bnx2x_fw_defs.h → trunk/drivers/net/bnx2x/bnx2x_fw_defs.h b/trunk/drivers/net/bnx2x_fw_defs.h → trunk/drivers/net/bnx2x/bnx2x_fw_defs.h
diff --git a/trunk/drivers/net/bnx2x_fw_file_hdr.h → trunk/drivers/net/bnx2x/bnx2x_fw_file_hdr.h b/trunk/drivers/net/bnx2x_fw_file_hdr.h → trunk/drivers/net/bnx2x/bnx2x_fw_file_hdr.h
diff --git a/trunk/drivers/net/bnx2x_hsi.h → trunk/drivers/net/bnx2x/bnx2x_hsi.h b/trunk/drivers/net/bnx2x_hsi.h → trunk/drivers/net/bnx2x/bnx2x_hsi.h
diff --git a/trunk/drivers/net/bnx2x_init.h → trunk/drivers/net/bnx2x/bnx2x_init.h b/trunk/drivers/net/bnx2x_init.h → trunk/drivers/net/bnx2x/bnx2x_init.h
diff --git a/trunk/drivers/net/bnx2x_init_ops.h → trunk/drivers/net/bnx2x/bnx2x_init_ops.h b/trunk/drivers/net/bnx2x_init_ops.h → trunk/drivers/net/bnx2x/bnx2x_init_ops.h
diff --git a/trunk/drivers/net/bnx2x_link.c → trunk/drivers/net/bnx2x/bnx2x_link.c b/trunk/drivers/net/bnx2x_link.c → trunk/drivers/net/bnx2x/bnx2x_link.c
diff --git a/trunk/drivers/net/bnx2x_link.h → trunk/drivers/net/bnx2x/bnx2x_link.h b/trunk/drivers/net/bnx2x_link.h → trunk/drivers/net/bnx2x/bnx2x_link.h
diff --git a/trunk/drivers/net/bnx2x_main.c → trunk/drivers/net/bnx2x/bnx2x_main.c b/trunk/drivers/net/bnx2x_main.c → trunk/drivers/net/bnx2x/bnx2x_main.c
diff --git a/trunk/drivers/net/bnx2x_reg.h → trunk/drivers/net/bnx2x/bnx2x_reg.h b/trunk/drivers/net/bnx2x_reg.h → trunk/drivers/net/bnx2x/bnx2x_reg.h
diff --git a/trunk/drivers/net/cnic.c b/trunk/drivers/net/cnic.c
@@ -40,9 +40,9 @@
 
 #include "cnic_if.h"
 #include "bnx2.h"
-#include "bnx2x_reg.h"
-#include "bnx2x_fw_defs.h"
-#include "bnx2x_hsi.h"
+#include "bnx2x/bnx2x_reg.h"
+#include "bnx2x/bnx2x_fw_defs.h"
+#include "bnx2x/bnx2x_hsi.h"
 #include "../scsi/bnx2i/57xx_iscsi_constants.h"
 #include "../scsi/bnx2i/57xx_iscsi_hsi.h"
 #include "cnic.h"