diff options
Diffstat (limited to 'drivers/net/wireless/b43/tables_nphy.c')
| -rw-r--r-- | drivers/net/wireless/b43/tables_nphy.c | 20 | 
1 files changed, 10 insertions, 10 deletions
diff --git a/drivers/net/wireless/b43/tables_nphy.c b/drivers/net/wireless/b43/tables_nphy.c index a00d509150f..d96e870ab8f 100644 --- a/drivers/net/wireless/b43/tables_nphy.c +++ b/drivers/net/wireless/b43/tables_nphy.c @@ -318,14 +318,14 @@ void b2055_upload_inittab(struct b43_wldev *dev,  	.radio_c2_tx_mxbgtrim	= r21  #define PHYREGS(r0, r1, r2, r3, r4, r5)	\ -	.phy_bw1a	= r0,		\ -	.phy_bw2	= r1,		\ -	.phy_bw3	= r2,		\ -	.phy_bw4	= r3,		\ -	.phy_bw5	= r4,		\ -	.phy_bw6	= r5 +	.phy_regs.phy_bw1a	= r0,	\ +	.phy_regs.phy_bw2	= r1,	\ +	.phy_regs.phy_bw3	= r2,	\ +	.phy_regs.phy_bw4	= r3,	\ +	.phy_regs.phy_bw5	= r4,	\ +	.phy_regs.phy_bw6	= r5 -static const struct b43_nphy_channeltab_entry b43_nphy_channeltab[] = { +static const struct b43_nphy_channeltab_entry_rev2 b43_nphy_channeltab[] = {    {	.channel		= 184,  	.freq			= 4920, /* MHz */  	.unk2			= 3280, @@ -1320,10 +1320,10 @@ static const struct b43_nphy_channeltab_entry b43_nphy_channeltab[] = {    },  }; -const struct b43_nphy_channeltab_entry * -b43_nphy_get_chantabent(struct b43_wldev *dev, u8 channel) +const struct b43_nphy_channeltab_entry_rev2 * +b43_nphy_get_chantabent_rev2(struct b43_wldev *dev, u8 channel)  { -	const struct b43_nphy_channeltab_entry *e; +	const struct b43_nphy_channeltab_entry_rev2 *e;  	unsigned int i;  	for (i = 0; i < ARRAY_SIZE(b43_nphy_channeltab); i++) {  |