diff options
| author | Michal Marek <mmarek@suse.com> | 2015-11-26 14:48:54 +0100 |
|---|---|---|
| committer | Michal Marek <mmarek@suse.com> | 2015-11-26 20:53:07 +0100 |
| commit | de5315ce36463141b6d3743bec890e93443ebcb2 (patch) | |
| tree | 355f47c10e26375564f5f609da69c9d289d8e6a9 /scripts | |
| parent | 5921be792da61a84e0b53ed64908aab8145c859d (diff) | |
| download | linux-de5315ce36463141b6d3743bec890e93443ebcb2.tar.gz linux-de5315ce36463141b6d3743bec890e93443ebcb2.tar.bz2 linux-de5315ce36463141b6d3743bec890e93443ebcb2.zip | |
ath10k: Fix build with CONFIG_THERMAL=m
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>
Acked-by: Kalle Valo <kvalo@qca.qualcomm.com>
Signed-off-by: Michal Marek <mmarek@suse.com>
Diffstat (limited to 'scripts')
0 files changed, 0 insertions, 0 deletions