From 5d1e859c5b600c491336f023a2f2105c24597226 Mon Sep 17 00:00:00 2001 From: Dmitry Kravkov Date: Tue, 27 Jul 2010 12:31:10 +0000 Subject: [PATCH] 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 Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller --- drivers/net/Makefile | 3 +-- drivers/net/bnx2x/Makefile | 7 +++++++ drivers/net/{ => bnx2x}/bnx2x.h | 2 +- drivers/net/{ => bnx2x}/bnx2x_dump.h | 0 drivers/net/{ => bnx2x}/bnx2x_fw_defs.h | 0 drivers/net/{ => bnx2x}/bnx2x_fw_file_hdr.h | 0 drivers/net/{ => bnx2x}/bnx2x_hsi.h | 0 drivers/net/{ => bnx2x}/bnx2x_init.h | 0 drivers/net/{ => bnx2x}/bnx2x_init_ops.h | 0 drivers/net/{ => bnx2x}/bnx2x_link.c | 0 drivers/net/{ => bnx2x}/bnx2x_link.h | 0 drivers/net/{ => bnx2x}/bnx2x_main.c | 0 drivers/net/{ => bnx2x}/bnx2x_reg.h | 0 drivers/net/cnic.c | 6 +++--- 14 files changed, 12 insertions(+), 6 deletions(-) create mode 100644 drivers/net/bnx2x/Makefile rename drivers/net/{ => bnx2x}/bnx2x.h (99%) rename drivers/net/{ => bnx2x}/bnx2x_dump.h (100%) rename drivers/net/{ => bnx2x}/bnx2x_fw_defs.h (100%) rename drivers/net/{ => bnx2x}/bnx2x_fw_file_hdr.h (100%) rename drivers/net/{ => bnx2x}/bnx2x_hsi.h (100%) rename drivers/net/{ => bnx2x}/bnx2x_init.h (100%) rename drivers/net/{ => bnx2x}/bnx2x_init_ops.h (100%) rename drivers/net/{ => bnx2x}/bnx2x_link.c (100%) rename drivers/net/{ => bnx2x}/bnx2x_link.h (100%) rename drivers/net/{ => bnx2x}/bnx2x_main.c (100%) rename drivers/net/{ => bnx2x}/bnx2x_reg.h (100%) diff --git a/drivers/net/Makefile b/drivers/net/Makefile index ce555819c8f..56e8c27f77c 100644 --- 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 new file mode 100644 index 00000000000..46c853b6cc5 --- /dev/null +++ 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 b/drivers/net/bnx2x/bnx2x.h similarity index 99% rename from drivers/net/bnx2x.h rename to drivers/net/bnx2x/bnx2x.h index 8bd23687c53..3b51c5f0b0a 100644 --- a/drivers/net/bnx2x.h +++ b/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 b/drivers/net/bnx2x/bnx2x_dump.h similarity index 100% rename from drivers/net/bnx2x_dump.h rename to drivers/net/bnx2x/bnx2x_dump.h diff --git a/drivers/net/bnx2x_fw_defs.h b/drivers/net/bnx2x/bnx2x_fw_defs.h similarity index 100% rename from drivers/net/bnx2x_fw_defs.h rename to drivers/net/bnx2x/bnx2x_fw_defs.h diff --git a/drivers/net/bnx2x_fw_file_hdr.h b/drivers/net/bnx2x/bnx2x_fw_file_hdr.h similarity index 100% rename from drivers/net/bnx2x_fw_file_hdr.h rename to drivers/net/bnx2x/bnx2x_fw_file_hdr.h diff --git a/drivers/net/bnx2x_hsi.h b/drivers/net/bnx2x/bnx2x_hsi.h similarity index 100% rename from drivers/net/bnx2x_hsi.h rename to drivers/net/bnx2x/bnx2x_hsi.h diff --git a/drivers/net/bnx2x_init.h b/drivers/net/bnx2x/bnx2x_init.h similarity index 100% rename from drivers/net/bnx2x_init.h rename to drivers/net/bnx2x/bnx2x_init.h diff --git a/drivers/net/bnx2x_init_ops.h b/drivers/net/bnx2x/bnx2x_init_ops.h similarity index 100% rename from drivers/net/bnx2x_init_ops.h rename to drivers/net/bnx2x/bnx2x_init_ops.h diff --git a/drivers/net/bnx2x_link.c b/drivers/net/bnx2x/bnx2x_link.c similarity index 100% rename from drivers/net/bnx2x_link.c rename to drivers/net/bnx2x/bnx2x_link.c diff --git a/drivers/net/bnx2x_link.h b/drivers/net/bnx2x/bnx2x_link.h similarity index 100% rename from drivers/net/bnx2x_link.h rename to drivers/net/bnx2x/bnx2x_link.h diff --git a/drivers/net/bnx2x_main.c b/drivers/net/bnx2x/bnx2x_main.c similarity index 100% rename from drivers/net/bnx2x_main.c rename to drivers/net/bnx2x/bnx2x_main.c diff --git a/drivers/net/bnx2x_reg.h b/drivers/net/bnx2x/bnx2x_reg.h similarity index 100% rename from drivers/net/bnx2x_reg.h rename to drivers/net/bnx2x/bnx2x_reg.h diff --git a/drivers/net/cnic.c b/drivers/net/cnic.c index 5ecf0bcf372..09610323a94 100644 --- 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" -- 2.46.0