diff options
| author | David S. Miller <davem@davemloft.net> | 2009-09-09 17:33:45 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-09-09 17:33:45 -0700 |
| commit | ea6a634ef7f0ab1d1f48ba0ad4f50e96d6065312 (patch) | |
| tree | fbf291540b824183e0d9292906e9570fd344ebaa /drivers/net/wireless/rt2x00/rt2500usb.c | |
| parent | fa1a9c681377c57e233038e50479e7d7a5cc3108 (diff) | |
| parent | b2e3abdc708f8c0eff194af25362fdb239abe241 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'drivers/net/wireless/rt2x00/rt2500usb.c')
| -rw-r--r-- | drivers/net/wireless/rt2x00/rt2500usb.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2500usb.c b/drivers/net/wireless/rt2x00/rt2500usb.c index b04f59bab3b0..22dd6d9e2981 100644 --- a/drivers/net/wireless/rt2x00/rt2500usb.c +++ b/drivers/net/wireless/rt2x00/rt2500usb.c @@ -488,10 +488,6 @@ static void rt2500usb_config_erp(struct rt2x00_dev *rt2x00dev, { u16 reg; - rt2500usb_register_read(rt2x00dev, TXRX_CSR1, ®); - rt2x00_set_field16(®, TXRX_CSR1_ACK_TIMEOUT, erp->ack_timeout); - rt2500usb_register_write(rt2x00dev, TXRX_CSR1, reg); - rt2500usb_register_read(rt2x00dev, TXRX_CSR10, ®); rt2x00_set_field16(®, TXRX_CSR10_AUTORESPOND_PREAMBLE, !!erp->short_preamble); |