[PATCH] ath10: Fix build with CONFIG_THERMAL=m

Michal Marek mmarek at suse.cz
Thu Nov 26 07:53:31 PST 2015

On 2015-11-26 16:36, Michal Marek wrote:
> 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.

Forgot to mention: The above commit only exists in the kbuild tree, so I
will apply this there as well, unless anybody objects. Applying the
patch to the ath tree would break the other way around.


More information about the ath10k mailing list