bnx2x: Create separate folder for bnx2x driver
Dmitry Kravkov [Tue, 27 Jul 2010 12:31:10 +0000 (12:31 +0000)]
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>

14 files changed:
drivers/net/Makefile
drivers/net/bnx2x/Makefile [new file with mode: 0644]
drivers/net/bnx2x/bnx2x.h [moved from drivers/net/bnx2x.h with 99% similarity]
drivers/net/bnx2x/bnx2x_dump.h [moved from drivers/net/bnx2x_dump.h with 100% similarity]
drivers/net/bnx2x/bnx2x_fw_defs.h [moved from drivers/net/bnx2x_fw_defs.h with 100% similarity]
drivers/net/bnx2x/bnx2x_fw_file_hdr.h [moved from drivers/net/bnx2x_fw_file_hdr.h with 100% similarity]
drivers/net/bnx2x/bnx2x_hsi.h [moved from drivers/net/bnx2x_hsi.h with 100% similarity]
drivers/net/bnx2x/bnx2x_init.h [moved from drivers/net/bnx2x_init.h with 100% similarity]
drivers/net/bnx2x/bnx2x_init_ops.h [moved from drivers/net/bnx2x_init_ops.h with 100% similarity]
drivers/net/bnx2x/bnx2x_link.c [moved from drivers/net/bnx2x_link.c with 100% similarity]
drivers/net/bnx2x/bnx2x_link.h [moved from drivers/net/bnx2x_link.h with 100% similarity]
drivers/net/bnx2x/bnx2x_main.c [moved from drivers/net/bnx2x_main.c with 100% similarity]
drivers/net/bnx2x/bnx2x_reg.h [moved from drivers/net/bnx2x_reg.h with 100% similarity]
drivers/net/cnic.c

index ce55581..56e8c27 100644 (file)
@@ -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
new file mode 100644 (file)
index 0000000..46c853b
--- /dev/null
@@ -0,0 +1,7 @@
+#
+# Makefile for Broadcom 10-Gigabit ethernet driver
+#
+
+obj-$(CONFIG_BNX2X) += bnx2x.o
+
+bnx2x-objs := bnx2x_main.o bnx2x_link.o
similarity index 99%
rename from drivers/net/bnx2x.h
rename to drivers/net/bnx2x/bnx2x.h
index 8bd2368..3b51c5f 100644 (file)
@@ -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
 
 
index 5ecf0bc..0961032 100644 (file)
@@ -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"