diff --git a/[refs] b/[refs]
index 40dabd219179..39370f289dc9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0f474d9bc59e23f1952e75d2f6edcaeb358eb32d
+refs/heads/master: 23bd462b6dd8b9d6ee2540a491e432c09dfcff4a
diff --git a/trunk/drivers/net/Makefile b/trunk/drivers/net/Makefile
index c9faa4605905..59842a109e9d 100644
--- a/trunk/drivers/net/Makefile
+++ b/trunk/drivers/net/Makefile
@@ -66,6 +66,7 @@ obj-$(CONFIG_FEALNX) += fealnx.o
 obj-$(CONFIG_TIGON3) += tg3.o
 obj-$(CONFIG_BNX2) += bnx2.o
 obj-$(CONFIG_BNX2X) += bnx2x.o
+bnx2x-objs := bnx2x_main.o
 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.c b/trunk/drivers/net/bnx2x_main.c
similarity index 100%
rename from trunk/drivers/net/bnx2x.c
rename to trunk/drivers/net/bnx2x_main.c