diff options
| author | Kalle Valo | 2017-11-02 18:48:25 +0100 |
|---|---|---|
| committer | Kalle Valo | 2017-11-02 18:48:25 +0100 |
| commit | e226fb5affccca98c405de80527180224d93d251 (patch) | |
| tree | a8a25b182db5058c874f6ca85383ad9f244afbac /drivers/net/wireless/ath/ath10k/pci.h | |
| parent | rsi: fix kbuild reported build errors with CONFIG_PM off (diff) | |
| parent | ath: Convert timers to use timer_setup() (diff) | |
| download | kernel-qcow2-linux-e226fb5affccca98c405de80527180224d93d251.tar.gz kernel-qcow2-linux-e226fb5affccca98c405de80527180224d93d251.tar.xz kernel-qcow2-linux-e226fb5affccca98c405de80527180224d93d251.zip | |
Merge ath-next from git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git
ath.git patches for 4.15. Major changes:
wil6210
* remove ssid debugfs file
Diffstat (limited to 'drivers/net/wireless/ath/ath10k/pci.h')
| -rw-r--r-- | drivers/net/wireless/ath/ath10k/pci.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath/ath10k/pci.h b/drivers/net/wireless/ath/ath10k/pci.h index 424ff323b2dc..08704fbc11e3 100644 --- a/drivers/net/wireless/ath/ath10k/pci.h +++ b/drivers/net/wireless/ath/ath10k/pci.h @@ -278,7 +278,7 @@ void ath10k_pci_hif_power_down(struct ath10k *ar); int ath10k_pci_alloc_pipes(struct ath10k *ar); void ath10k_pci_free_pipes(struct ath10k *ar); void ath10k_pci_free_pipes(struct ath10k *ar); -void ath10k_pci_rx_replenish_retry(unsigned long ptr); +void ath10k_pci_rx_replenish_retry(struct timer_list *t); void ath10k_pci_ce_deinit(struct ath10k *ar); void ath10k_pci_init_napi(struct ath10k *ar); int ath10k_pci_init_pipes(struct ath10k *ar); |