Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem

1 files changed, 13 insertions, 1 deletions

diff --git a/drivers/net/wireless/b43/phy_ht.h b/drivers/net/wireless/b43/phy_ht.h
index afa448d6571e..7ad7affc8df0 100644
--- a/drivers/net/wireless/b43/phy_ht.h
+++ b/drivers/net/wireless/b43/phy_ht.h
@@ -4,9 +4,16 @@
 #include "phy_common.h"
 
 
+#define B43_PHY_HT_BANDCTL                      0x009 /* Band control */
 #define B43_PHY_HT_TABLE_ADDR                   0x072 /* Table address */
 #define B43_PHY_HT_TABLE_DATALO                 0x073 /* Table data low */
 #define B43_PHY_HT_TABLE_DATAHI                 0x074 /* Table data high */
+#define B43_PHY_HT_BW1                          0x1CE
+#define B43_PHY_HT_BW2                          0x1CF
+#define B43_PHY_HT_BW3                          0x1D0
+#define B43_PHY_HT_BW4                          0x1D1
+#define B43_PHY_HT_BW5                          0x1D2
+#define B43_PHY_HT_BW6                          0x1D3
 
 #define B43_PHY_HT_RF_CTL1                      B43_PHY_EXTG(0x010)
 
@@ -20,7 +27,12 @@
 
 /* Values for PHY registers used on channel switching */
 struct b43_phy_ht_channeltab_e_phy {
-        /* TODO */
+        u16 bw1;
+        u16 bw2;
+        u16 bw3;
+        u16 bw4;
+        u16 bw5;
+        u16 bw6;
 };