diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-06-08 22:19:41 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-06-08 22:19:41 -0400 |
| commit | 8a3e1c670e503ddd6f6c373b307f38b783ee3a50 (patch) | |
| tree | 03094e8425b750d2693a271ebc89b49312e5476a /drivers/net/wireless/rtl8180_sa2400.c | |
| parent | e026892c85571e12f11abffde5a90bcc704d663e (diff) | |
| parent | 60d5019be8acef268f4676d229c490186d338fbc (diff) | |
Merge branch 'merge'
Conflicts:
arch/powerpc/sysdev/fsl_soc.c
Diffstat (limited to 'drivers/net/wireless/rtl8180_sa2400.c')
| -rw-r--r-- | drivers/net/wireless/rtl8180_sa2400.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/rtl8180_sa2400.c b/drivers/net/wireless/rtl8180_sa2400.c index 0311b4ea124c..cea4e0ccb92d 100644 --- a/drivers/net/wireless/rtl8180_sa2400.c +++ b/drivers/net/wireless/rtl8180_sa2400.c | |||
| @@ -86,7 +86,7 @@ static void sa2400_rf_set_channel(struct ieee80211_hw *dev, | |||
| 86 | 86 | ||
| 87 | write_sa2400(dev, 7, txpw); | 87 | write_sa2400(dev, 7, txpw); |
| 88 | 88 | ||
| 89 | sa2400_write_phy_antenna(dev, chan); | 89 | sa2400_write_phy_antenna(dev, channel); |
| 90 | 90 | ||
| 91 | write_sa2400(dev, 0, chan); | 91 | write_sa2400(dev, 0, chan); |
| 92 | write_sa2400(dev, 1, 0xbb50); | 92 | write_sa2400(dev, 1, 0xbb50); |