diff options
| author | David S. Miller <davem@davemloft.net> | 2009-04-25 16:36:46 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-04-25 16:36:46 -0700 |
| commit | 495a1b4eff1a216a3ea171ac137f1807e6555f52 (patch) | |
| tree | 72d059d6d66fac6a74df33bac2eb40dcd0ea0732 /drivers/net/wireless/rt2x00/rt2500pci.c | |
| parent | ad8affd972a705a38e769859c50ee8e749b631da (diff) | |
| parent | d3feaf5ad12259927039a675cfb25dc342b403ab (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Conflicts:
net/mac80211/pm.c
Diffstat (limited to 'drivers/net/wireless/rt2x00/rt2500pci.c')
| -rw-r--r-- | drivers/net/wireless/rt2x00/rt2500pci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2500pci.c b/drivers/net/wireless/rt2x00/rt2500pci.c index 276a8232aaa..e1be67ca23d 100644 --- a/drivers/net/wireless/rt2x00/rt2500pci.c +++ b/drivers/net/wireless/rt2x00/rt2500pci.c @@ -1525,7 +1525,7 @@ static int rt2500pci_init_eeprom(struct rt2x00_dev *rt2x00dev) */ value = rt2x00_get_field16(eeprom, EEPROM_ANTENNA_RF_TYPE); rt2x00pci_register_read(rt2x00dev, CSR0, ®); - rt2x00_set_chip(rt2x00dev, RT2560, value, reg); + rt2x00_set_chip_rf(rt2x00dev, value, reg); if (!rt2x00_rf(&rt2x00dev->chip, RF2522) && !rt2x00_rf(&rt2x00dev->chip, RF2523) && |