diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-03-03 21:31:09 +1100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-03-03 21:31:09 +1100 |
| commit | 3cecdda3f169f22f324f78fd544beee68e3cc6a4 (patch) | |
| tree | e7c2995ddc2690d1be695a1525bcd16d3965548d /drivers/net/wireless/ath5k/ath5k.h | |
| parent | b9c64498f53e0f4d90eec03048f73ac215bb6f79 (diff) | |
| parent | da40451bba23b51eaca4170a095891646ce72104 (diff) | |
Merge branch 'for-2.6.25' of master.kernel.org:/pub/scm/linux/kernel/git/arnd/cell-2.6 into merge
Diffstat (limited to 'drivers/net/wireless/ath5k/ath5k.h')
| -rw-r--r-- | drivers/net/wireless/ath5k/ath5k.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath5k/ath5k.h b/drivers/net/wireless/ath5k/ath5k.h index c79066b38d3..69dea339261 100644 --- a/drivers/net/wireless/ath5k/ath5k.h +++ b/drivers/net/wireless/ath5k/ath5k.h @@ -1035,7 +1035,7 @@ struct ath5k_hw { unsigned int, unsigned int, enum ath5k_pkt_type, unsigned int, unsigned int, unsigned int, unsigned int, unsigned int, unsigned int, unsigned int, unsigned int); - bool (*ah_setup_xtx_desc)(struct ath5k_hw *, struct ath5k_desc *, + int (*ah_setup_xtx_desc)(struct ath5k_hw *, struct ath5k_desc *, unsigned int, unsigned int, unsigned int, unsigned int, unsigned int, unsigned int); int (*ah_proc_tx_desc)(struct ath5k_hw *, struct ath5k_desc *); |