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/ath6kl/core.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/ath6kl/core.h')
-rw-r--r-- | drivers/net/wireless/ath/ath6kl/core.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath/ath6kl/core.h b/drivers/net/wireless/ath/ath6kl/core.h index 87e99c12d4ba..e23d450babd2 100644 --- a/drivers/net/wireless/ath/ath6kl/core.h +++ b/drivers/net/wireless/ath/ath6kl/core.h @@ -893,7 +893,7 @@ static inline u32 ath6kl_get_hi_item_addr(struct ath6kl *ar, int ath6kl_configure_target(struct ath6kl *ar); void ath6kl_detect_error(unsigned long ptr); -void disconnect_timer_handler(unsigned long ptr); +void disconnect_timer_handler(struct timer_list *t); void init_netdev(struct net_device *dev); void ath6kl_cookie_init(struct ath6kl *ar); void ath6kl_cookie_cleanup(struct ath6kl *ar); |