diff options
-rw-r--r-- | drivers/net/Makefile | 3 | ||||
-rw-r--r-- | drivers/net/bnx2x/Makefile | 7 | ||||
-rw-r--r-- | drivers/net/bnx2x/bnx2x.h (renamed from drivers/net/bnx2x.h) | 2 | ||||
-rw-r--r-- | drivers/net/bnx2x/bnx2x_dump.h (renamed from drivers/net/bnx2x_dump.h) | 0 | ||||
-rw-r--r-- | drivers/net/bnx2x/bnx2x_fw_defs.h (renamed from drivers/net/bnx2x_fw_defs.h) | 0 | ||||
-rw-r--r-- | drivers/net/bnx2x/bnx2x_fw_file_hdr.h (renamed from drivers/net/bnx2x_fw_file_hdr.h) | 0 | ||||
-rw-r--r-- | drivers/net/bnx2x/bnx2x_hsi.h (renamed from drivers/net/bnx2x_hsi.h) | 0 | ||||
-rw-r--r-- | drivers/net/bnx2x/bnx2x_init.h (renamed from drivers/net/bnx2x_init.h) | 0 | ||||
-rw-r--r-- | drivers/net/bnx2x/bnx2x_init_ops.h (renamed from drivers/net/bnx2x_init_ops.h) | 0 | ||||
-rw-r--r-- | drivers/net/bnx2x/bnx2x_link.c (renamed from drivers/net/bnx2x_link.c) | 0 | ||||
-rw-r--r-- | drivers/net/bnx2x/bnx2x_link.h (renamed from drivers/net/bnx2x_link.h) | 0 | ||||
-rw-r--r-- | drivers/net/bnx2x/bnx2x_main.c (renamed from drivers/net/bnx2x_main.c) | 0 | ||||
-rw-r--r-- | drivers/net/bnx2x/bnx2x_reg.h (renamed from drivers/net/bnx2x_reg.h) | 0 | ||||
-rw-r--r-- | drivers/net/cnic.c | 6 |
14 files changed, 12 insertions, 6 deletions
diff --git a/drivers/net/Makefile b/drivers/net/Makefile index ce55581..56e8c27 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 0000000..46c853b --- /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 index 8bd2368..3b51c5f 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 index 3bb9a91..3bb9a91 100644 --- a/drivers/net/bnx2x_dump.h +++ b/drivers/net/bnx2x/bnx2x_dump.h diff --git a/drivers/net/bnx2x_fw_defs.h b/drivers/net/bnx2x/bnx2x_fw_defs.h index 08d71bf..08d71bf 100644 --- a/drivers/net/bnx2x_fw_defs.h +++ b/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 index 3f5ee5d..3f5ee5d 100644 --- a/drivers/net/bnx2x_fw_file_hdr.h +++ b/drivers/net/bnx2x/bnx2x_fw_file_hdr.h diff --git a/drivers/net/bnx2x_hsi.h b/drivers/net/bnx2x/bnx2x_hsi.h index fd1f29e..fd1f29e 100644 --- a/drivers/net/bnx2x_hsi.h +++ b/drivers/net/bnx2x/bnx2x_hsi.h diff --git a/drivers/net/bnx2x_init.h b/drivers/net/bnx2x/bnx2x_init.h index 65b26cb..65b26cb 100644 --- a/drivers/net/bnx2x_init.h +++ b/drivers/net/bnx2x/bnx2x_init.h diff --git a/drivers/net/bnx2x_init_ops.h b/drivers/net/bnx2x/bnx2x_init_ops.h index 2b1363a..2b1363a 100644 --- a/drivers/net/bnx2x_init_ops.h +++ b/drivers/net/bnx2x/bnx2x_init_ops.h diff --git a/drivers/net/bnx2x_link.c b/drivers/net/bnx2x/bnx2x_link.c index 0383e30..0383e30 100644 --- a/drivers/net/bnx2x_link.c +++ b/drivers/net/bnx2x/bnx2x_link.c diff --git a/drivers/net/bnx2x_link.h b/drivers/net/bnx2x/bnx2x_link.h index 40c2981..40c2981 100644 --- a/drivers/net/bnx2x_link.h +++ b/drivers/net/bnx2x/bnx2x_link.h diff --git a/drivers/net/bnx2x_main.c b/drivers/net/bnx2x/bnx2x_main.c index 51b7883..51b7883 100644 --- a/drivers/net/bnx2x_main.c +++ b/drivers/net/bnx2x/bnx2x_main.c diff --git a/drivers/net/bnx2x_reg.h b/drivers/net/bnx2x/bnx2x_reg.h index a1f3bf0..a1f3bf0 100644 --- a/drivers/net/bnx2x_reg.h +++ b/drivers/net/bnx2x/bnx2x_reg.h diff --git a/drivers/net/cnic.c b/drivers/net/cnic.c index 5ecf0bc..0961032 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" |