diff options
| author | David S. Miller <davem@davemloft.net> | 2010-02-14 20:45:59 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-02-14 20:45:59 -0500 |
| commit | f6f223039c0d0683bdea1eabd35b309e10311a60 (patch) | |
| tree | 890e07acf8c18ddc2994ebc0a0bdcdda38b0dcc6 /drivers/net/wireless/rt2x00/rt2500pci.c | |
| parent | b3b3f04fb587ecb61b5baa6c1c5f0e666fd12d73 (diff) | |
| parent | 42c4568a4ace0adc27a9d6f02936e2047ba6fc7e (diff) | |
Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'drivers/net/wireless/rt2x00/rt2500pci.c')
| -rw-r--r-- | drivers/net/wireless/rt2x00/rt2500pci.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2500pci.c b/drivers/net/wireless/rt2x00/rt2500pci.c index 77ee1df7933f..f6440bb0e5f6 100644 --- a/drivers/net/wireless/rt2x00/rt2500pci.c +++ b/drivers/net/wireless/rt2x00/rt2500pci.c | |||
| @@ -1859,7 +1859,6 @@ static const struct ieee80211_ops rt2500pci_mac80211_ops = { | |||
| 1859 | .get_stats = rt2x00mac_get_stats, | 1859 | .get_stats = rt2x00mac_get_stats, |
| 1860 | .bss_info_changed = rt2x00mac_bss_info_changed, | 1860 | .bss_info_changed = rt2x00mac_bss_info_changed, |
| 1861 | .conf_tx = rt2x00mac_conf_tx, | 1861 | .conf_tx = rt2x00mac_conf_tx, |
| 1862 | .get_tx_stats = rt2x00mac_get_tx_stats, | ||
| 1863 | .get_tsf = rt2500pci_get_tsf, | 1862 | .get_tsf = rt2500pci_get_tsf, |
| 1864 | .tx_last_beacon = rt2500pci_tx_last_beacon, | 1863 | .tx_last_beacon = rt2500pci_tx_last_beacon, |
| 1865 | .rfkill_poll = rt2x00mac_rfkill_poll, | 1864 | .rfkill_poll = rt2x00mac_rfkill_poll, |