diff --git a/[refs] b/[refs]
index 010e5af17de3..69cc4d11efe1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 99c4a780624da24d20309f2be5abe5ef8d20fcc0
+refs/heads/master: 3d0da7516441d41dbfcc2b2667d9b792d580e50b
diff --git a/trunk/drivers/net/wireless/b43/Makefile b/trunk/drivers/net/wireless/b43/Makefile
index fb6ffce03f0a..7fe49034ff2b 100644
--- a/trunk/drivers/net/wireless/b43/Makefile
+++ b/trunk/drivers/net/wireless/b43/Makefile
@@ -4,7 +4,7 @@ b43-$(CONFIG_B43_NPHY)		+= tables_nphy.o
 b43-y				+= phy_common.o
 b43-y				+= phy_g.o
 b43-y				+= phy_a.o
-b43-$(CONFIG_B43_NPHY)		+= nphy.o
+b43-$(CONFIG_B43_NPHY)		+= phy_n.o
 b43-y				+= sysfs.o
 b43-y				+= xmit.o
 b43-y				+= lo.o
diff --git a/trunk/drivers/net/wireless/b43/main.c b/trunk/drivers/net/wireless/b43/main.c
index 2d915c1a82a1..fda9492d5884 100644
--- a/trunk/drivers/net/wireless/b43/main.c
+++ b/trunk/drivers/net/wireless/b43/main.c
@@ -46,7 +46,7 @@
 #include "debugfs.h"
 #include "phy_common.h"
 #include "phy_g.h"
-#include "nphy.h"
+#include "phy_n.h"
 #include "dma.h"
 #include "pio.h"
 #include "sysfs.h"
diff --git a/trunk/drivers/net/wireless/b43/phy_common.c b/trunk/drivers/net/wireless/b43/phy_common.c
index 5a550a7af2e9..4b6c944be042 100644
--- a/trunk/drivers/net/wireless/b43/phy_common.c
+++ b/trunk/drivers/net/wireless/b43/phy_common.c
@@ -29,7 +29,7 @@
 #include "phy_common.h"
 #include "phy_g.h"
 #include "phy_a.h"
-#include "nphy.h"
+#include "phy_n.h"
 #include "b43.h"
 #include "main.h"
 
diff --git a/trunk/drivers/net/wireless/b43/nphy.c b/trunk/drivers/net/wireless/b43/phy_n.c
similarity index 99%
rename from trunk/drivers/net/wireless/b43/nphy.c
rename to trunk/drivers/net/wireless/b43/phy_n.c
index 4cfeab8560f6..8162fd7792ff 100644
--- a/trunk/drivers/net/wireless/b43/nphy.c
+++ b/trunk/drivers/net/wireless/b43/phy_n.c
@@ -26,7 +26,7 @@
 #include <linux/types.h>
 
 #include "b43.h"
-#include "nphy.h"
+#include "phy_n.h"
 #include "tables_nphy.h"
 
 
diff --git a/trunk/drivers/net/wireless/b43/nphy.h b/trunk/drivers/net/wireless/b43/phy_n.h
similarity index 100%
rename from trunk/drivers/net/wireless/b43/nphy.h
rename to trunk/drivers/net/wireless/b43/phy_n.h
diff --git a/trunk/drivers/net/wireless/b43/tables_nphy.c b/trunk/drivers/net/wireless/b43/tables_nphy.c
index 1de2c2e2e14c..4e2336315545 100644
--- a/trunk/drivers/net/wireless/b43/tables_nphy.c
+++ b/trunk/drivers/net/wireless/b43/tables_nphy.c
@@ -25,7 +25,7 @@
 #include "b43.h"
 #include "tables_nphy.h"
 #include "phy_common.h"
-#include "nphy.h"
+#include "phy_n.h"
 
 
 struct b2055_inittab_entry {