---

yaml --- r: 111402 b: refs/heads/master c: 3d0da75 h: refs/heads/master v: v3
git-mirror · Sep 5, 2008 · adaaa3d · adaaa3d
1 parent 65d0c8e
commit adaaa3d
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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 → trunk/drivers/net/wireless/b43/phy_n.c b/trunk/drivers/net/wireless/b43/nphy.c → 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 → trunk/drivers/net/wireless/b43/phy_n.h b/trunk/drivers/net/wireless/b43/nphy.h → 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
@@ -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 {