[PATCH] ath10: Fix build with CONFIG_THERMAL=m

Kalle Valo kvalo at qca.qualcomm.com
Thu Nov 26 09:01:42 PST 2015

+ linux-wireless

Michal Marek <mmarek at suse.com> writes:

> After commit cf4f21938e13 ("kbuild: Allow to specify composite modules
> with modname-m"), thermal.c gets included in the driver and the build
> fails with
> drivers/net/wireless/ath/ath10k/thermal.c:119:6: error: redefinition of ‘ath10k_thermal_event_temperature’
> drivers/net/wireless/ath/ath10k/thermal.h:54:20: note: previous definition of ‘ath10k_thermal_event_temperature’ was here
> drivers/net/wireless/ath/ath10k/thermal.c:136:6: error: redefinition of ‘ath10k_thermal_set_throttling’
> drivers/net/wireless/ath/ath10k/thermal.h:59:20: note: previous definition of ‘ath10k_thermal_set_throttling’ was here
> drivers/net/wireless/ath/ath10k/thermal.c:162:5: error: redefinition of ‘ath10k_thermal_register’
> drivers/net/wireless/ath/ath10k/thermal.h:45:19: note: previous definition of ‘ath10k_thermal_register’ was here
> drivers/net/wireless/ath/ath10k/thermal.c:216:6: error: redefinition of ‘ath10k_thermal_unregister’
> drivers/net/wireless/ath/ath10k/thermal.h:50:20: note: previous definition of ‘ath10k_thermal_unregister’ was here
> Change the #ifdef to reflect the new kbuild behavior.
> Reported-by: kbuild test robot <fengguang.wu at intel.com>
> Signed-off-by: Michal Marek <mmarek at suse.com>

Please fix the subject prefix to "ath10k: ", otherwise looks good. Feel
free to apply this to the kbuild tree.

Acked-by: Kalle Valo <kvalo at qca.qualcomm.com>

Kalle Valo

More information about the ath10k mailing list