Arnd Bergmann <arnd@xxxxxxxx> writes: > The combination of two patches has led to a build failure: > > drivers/net/wireless/ath/ath10k/pci.c: In function 'ath10k_pci_pm_suspend': > drivers/net/wireless/ath/ath10k/pci.c:3416:8: error: implicit declaration of function 'ath10k_pci_suspend'; did you mean 'ath10k_pci_pm_suspend'? [-Werror=implicit-function-declaration] > drivers/net/wireless/ath/ath10k/pci.c: In function 'ath10k_pci_pm_resume': > drivers/net/wireless/ath/ath10k/pci.c:3428:8: error: implicit declaration of function 'ath10k_pci_resume'; did you mean 'ath10k_pci_pm_resume'? [-Werror=implicit-function-declaration] > > This moves the functions outside of the now incorrect #ifdef. > > Fixes: 96378bd2c6cd ("ath10k: fix core PCI suspend when WoWLAN is supported but disabled") > Fixes: 6af1de2e4ec4 ("ath10k: mark PM functions as __maybe_unused") > Signed-off-by: Arnd Bergmann <arnd@xxxxxxxx> Brian has already fixed this, please check that: https://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git/commit/?h=ath-next&id=20665a9076d48e9abd9a2db13d307f58f7ef6647 But apparently I forgot to merge ath-next to wireless-drivers-next, will do that soon. -- Kalle Valo