bnx2x: Create separate folder for bnx2x driver

This commit includes files movement to newly created folder using git-mv command and fixes references in cnic and bnx2x code to each other. files moved using following: #!/bin/bash mkdir drivers/net/bnx2x/ list=$(cd drivers/net/ && ls bnx2x*.[ch]) for f in $list; do git mv -f drivers/net/$f drivers/net/bnx2x/$f done Signed-off-by: Dmitry Kravkov <dmitry@broadcom.com> Signed-off-by: Eilon Greenstein <eilong@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
git-mirror · Jul 28, 2010 · 5d1e859 · 5d1e859
1 parent 2c6952d
commit 5d1e859
Show file tree

Hide file tree

Showing 14 changed files with 12 additions and 6 deletions.
diff --git a/drivers/net/Makefile b/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/drivers/net/bnx2x/Makefile b/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/drivers/net/bnx2x.h → drivers/net/bnx2x/bnx2x.h b/drivers/net/bnx2x.h → 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/drivers/net/bnx2x_dump.h → drivers/net/bnx2x/bnx2x_dump.h b/drivers/net/bnx2x_dump.h → drivers/net/bnx2x/bnx2x_dump.h
diff --git a/drivers/net/bnx2x_fw_defs.h → drivers/net/bnx2x/bnx2x_fw_defs.h b/drivers/net/bnx2x_fw_defs.h → drivers/net/bnx2x/bnx2x_fw_defs.h
diff --git a/drivers/net/bnx2x_fw_file_hdr.h → drivers/net/bnx2x/bnx2x_fw_file_hdr.h b/drivers/net/bnx2x_fw_file_hdr.h → drivers/net/bnx2x/bnx2x_fw_file_hdr.h
diff --git a/drivers/net/bnx2x_hsi.h → drivers/net/bnx2x/bnx2x_hsi.h b/drivers/net/bnx2x_hsi.h → drivers/net/bnx2x/bnx2x_hsi.h
diff --git a/drivers/net/bnx2x_init.h → drivers/net/bnx2x/bnx2x_init.h b/drivers/net/bnx2x_init.h → drivers/net/bnx2x/bnx2x_init.h
diff --git a/drivers/net/bnx2x_init_ops.h → drivers/net/bnx2x/bnx2x_init_ops.h b/drivers/net/bnx2x_init_ops.h → drivers/net/bnx2x/bnx2x_init_ops.h
diff --git a/drivers/net/bnx2x_link.c → drivers/net/bnx2x/bnx2x_link.c b/drivers/net/bnx2x_link.c → drivers/net/bnx2x/bnx2x_link.c
diff --git a/drivers/net/bnx2x_link.h → drivers/net/bnx2x/bnx2x_link.h b/drivers/net/bnx2x_link.h → drivers/net/bnx2x/bnx2x_link.h
diff --git a/drivers/net/bnx2x_main.c → drivers/net/bnx2x/bnx2x_main.c b/drivers/net/bnx2x_main.c → drivers/net/bnx2x/bnx2x_main.c
diff --git a/drivers/net/bnx2x_reg.h → drivers/net/bnx2x/bnx2x_reg.h b/drivers/net/bnx2x_reg.h → drivers/net/bnx2x/bnx2x_reg.h
diff --git a/drivers/net/cnic.c b/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"