* [PATCH] ath10: Fix build with CONFIG_THERMAL=m [not found] <201511260039.iQbaOe1h%fengguang.wu@intel.com> @ 2015-11-26 15:36 ` Michal Marek 2015-11-26 15:53 ` Michal Marek 2015-11-26 17:01 ` Kalle Valo 0 siblings, 2 replies; 3+ messages in thread From: Michal Marek @ 2015-11-26 15:36 UTC (permalink / raw) To: linux-kbuild; +Cc: Kalle Valo, fengguang.wu, kbuild-all, ath10k 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@intel.com> Signed-off-by: Michal Marek <mmarek@suse.com> --- drivers/net/wireless/ath/ath10k/thermal.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/wireless/ath/ath10k/thermal.h b/drivers/net/wireless/ath/ath10k/thermal.h index b610ea5caae8..c9223e9e962f 100644 --- a/drivers/net/wireless/ath/ath10k/thermal.h +++ b/drivers/net/wireless/ath/ath10k/thermal.h @@ -36,7 +36,7 @@ struct ath10k_thermal { int temperature; }; -#ifdef CONFIG_THERMAL +#if IS_REACHABLE(CONFIG_THERMAL) int ath10k_thermal_register(struct ath10k *ar); void ath10k_thermal_unregister(struct ath10k *ar); void ath10k_thermal_event_temperature(struct ath10k *ar, int temperature); -- 2.1.4 _______________________________________________ ath10k mailing list ath10k@lists.infradead.org http://lists.infradead.org/mailman/listinfo/ath10k ^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] ath10: Fix build with CONFIG_THERMAL=m 2015-11-26 15:36 ` [PATCH] ath10: Fix build with CONFIG_THERMAL=m Michal Marek @ 2015-11-26 15:53 ` Michal Marek 2015-11-26 17:01 ` Kalle Valo 1 sibling, 0 replies; 3+ messages in thread From: Michal Marek @ 2015-11-26 15:53 UTC (permalink / raw) To: Kalle Valo; +Cc: fengguang.wu, kbuild-all, ath10k, linux-kbuild 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. Michal _______________________________________________ ath10k mailing list ath10k@lists.infradead.org http://lists.infradead.org/mailman/listinfo/ath10k ^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] ath10: Fix build with CONFIG_THERMAL=m 2015-11-26 15:36 ` [PATCH] ath10: Fix build with CONFIG_THERMAL=m Michal Marek 2015-11-26 15:53 ` Michal Marek @ 2015-11-26 17:01 ` Kalle Valo 1 sibling, 0 replies; 3+ messages in thread From: Kalle Valo @ 2015-11-26 17:01 UTC (permalink / raw) To: Michal Marek Cc: fengguang.wu, linux-wireless, kbuild-all, ath10k, linux-kbuild + linux-wireless Michal Marek <mmarek@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@intel.com> > Signed-off-by: Michal Marek <mmarek@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@qca.qualcomm.com> -- Kalle Valo _______________________________________________ ath10k mailing list ath10k@lists.infradead.org http://lists.infradead.org/mailman/listinfo/ath10k ^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-11-26 17:02 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <201511260039.iQbaOe1h%fengguang.wu@intel.com>
2015-11-26 15:36 ` [PATCH] ath10: Fix build with CONFIG_THERMAL=m Michal Marek
2015-11-26 15:53 ` Michal Marek
2015-11-26 17:01 ` Kalle Valo
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox