diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-06-08 21:44:21 +0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-06-08 21:44:21 +0400 |
| commit | c0c33addcba2ce753b4e2746db99feaae2f82a85 (patch) | |
| tree | dab480183ac0e64bfe9250e1f294705d1a424c78 /drivers/net/wireless/ath/ath9k/hw.h | |
| parent | ffbc03bc75b39c7bd412e7cc6d2185c11b0ffedd (diff) | |
| parent | 931749bf78b969c54de9bbc67cf29b13a40bb73b (diff) | |
| download | linux-c0c33addcba2ce753b4e2746db99feaae2f82a85.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/hw.h')
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/hw.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/wireless/ath/ath9k/hw.h b/drivers/net/wireless/ath/ath9k/hw.h index 4b157c53d1a8..6a6fb5439831 100644 --- a/drivers/net/wireless/ath/ath9k/hw.h +++ b/drivers/net/wireless/ath/ath9k/hw.h @@ -403,7 +403,6 @@ struct ath9k_beacon_state { u32 bs_nexttbtt; u32 bs_nextdtim; u32 bs_intval; -#define ATH9K_BEACON_PERIOD 0x0000ffff #define ATH9K_TSFOOR_THRESHOLD 0x00004240 /* 16k us */ u32 bs_dtimperiod; u16 bs_cfpperiod; @@ -603,7 +602,6 @@ struct ath_hw_ops { int power_off); void (*rx_enable)(struct ath_hw *ah); void (*set_desc_link)(void *ds, u32 link); - void (*get_desc_link)(void *ds, u32 **link); bool (*calibrate)(struct ath_hw *ah, struct ath9k_channel *chan, u8 rxchainmask, |