diff --git a/[refs] b/[refs]
index fa4519fb82fd..45af777012fe 100644
--- 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
index ce555819c8fc..56e8c27f77ce 100644
--- 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
new file mode 100644
index 000000000000..46c853b6cc53
--- /dev/null
+++ 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 b/trunk/drivers/net/bnx2x/bnx2x.h
similarity index 99%
rename from trunk/drivers/net/bnx2x.h
rename to trunk/drivers/net/bnx2x/bnx2x.h
index 8bd23687c530..3b51c5f0b0a3 100644
--- a/trunk/drivers/net/bnx2x.h
+++ b/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 b/trunk/drivers/net/bnx2x/bnx2x_dump.h
similarity index 100%
rename from trunk/drivers/net/bnx2x_dump.h
rename to trunk/drivers/net/bnx2x/bnx2x_dump.h
diff --git a/trunk/drivers/net/bnx2x_fw_defs.h b/trunk/drivers/net/bnx2x/bnx2x_fw_defs.h
similarity index 100%
rename from trunk/drivers/net/bnx2x_fw_defs.h
rename to trunk/drivers/net/bnx2x/bnx2x_fw_defs.h
diff --git a/trunk/drivers/net/bnx2x_fw_file_hdr.h b/trunk/drivers/net/bnx2x/bnx2x_fw_file_hdr.h
similarity index 100%
rename from trunk/drivers/net/bnx2x_fw_file_hdr.h
rename to trunk/drivers/net/bnx2x/bnx2x_fw_file_hdr.h
diff --git a/trunk/drivers/net/bnx2x_hsi.h b/trunk/drivers/net/bnx2x/bnx2x_hsi.h
similarity index 100%
rename from trunk/drivers/net/bnx2x_hsi.h
rename to trunk/drivers/net/bnx2x/bnx2x_hsi.h
diff --git a/trunk/drivers/net/bnx2x_init.h b/trunk/drivers/net/bnx2x/bnx2x_init.h
similarity index 100%
rename from trunk/drivers/net/bnx2x_init.h
rename to trunk/drivers/net/bnx2x/bnx2x_init.h
diff --git a/trunk/drivers/net/bnx2x_init_ops.h b/trunk/drivers/net/bnx2x/bnx2x_init_ops.h
similarity index 100%
rename from trunk/drivers/net/bnx2x_init_ops.h
rename to trunk/drivers/net/bnx2x/bnx2x_init_ops.h
diff --git a/trunk/drivers/net/bnx2x_link.c b/trunk/drivers/net/bnx2x/bnx2x_link.c
similarity index 100%
rename from trunk/drivers/net/bnx2x_link.c
rename to trunk/drivers/net/bnx2x/bnx2x_link.c
diff --git a/trunk/drivers/net/bnx2x_link.h b/trunk/drivers/net/bnx2x/bnx2x_link.h
similarity index 100%
rename from trunk/drivers/net/bnx2x_link.h
rename to trunk/drivers/net/bnx2x/bnx2x_link.h
diff --git a/trunk/drivers/net/bnx2x_main.c b/trunk/drivers/net/bnx2x/bnx2x_main.c
similarity index 100%
rename from trunk/drivers/net/bnx2x_main.c
rename to trunk/drivers/net/bnx2x/bnx2x_main.c
diff --git a/trunk/drivers/net/bnx2x_reg.h b/trunk/drivers/net/bnx2x/bnx2x_reg.h
similarity index 100%
rename from trunk/drivers/net/bnx2x_reg.h
rename to trunk/drivers/net/bnx2x/bnx2x_reg.h
diff --git a/trunk/drivers/net/cnic.c b/trunk/drivers/net/cnic.c
index 5ecf0bcf372d..09610323a948 100644
--- 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"